Merge lp:~zorba-coders/zorba/bug-885512 into lp:zorba

[Daniel Turcanu]

The bug was fixed in november. Paul did a fix, and the user had to do a clean rebuild.
The bug was not related to Windows 8.

The bug was fixed in november. Paul did a fix, and the user had to do a clean rebuild.
The bug was not related to Windows 8.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-885512-2012-01-04T11-24-02.503Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-885512-2012-01-04T11-24-02.503Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending.

[Paul J. Lucas (paul-lucas)]

Daniel: have you fixed the warnings on Windows Developer 8 Preview?

[Daniel Turcanu (danielturcanu)]

Those warnings about secure strcpy_s should not appear in a normal build because there is a flag that disables them.

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-885512-2012-01-04T20-50-58.653Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-885512-2012-01-04T20-50-58.653Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/util/string_util.h'
--- src/util/string_util.h	2011-10-11 17:59:20 +0000
+++ src/util/string_util.h	2012-01-04 11:24:25 +0000
@@ -28,6 +28,12 @@
 #include "cxx_util.h"
 #include "stl_util.h"
 
+#ifdef WIN32
+// Windows annoyingly defines these as macros.
+#undef max
+#undef min
+#endif /* WIN32 */
+
 namespace zorba {
 namespace ztd {