Merge lp:~paul-lucas/zorba/bug-980463 into lp:zorba

[Paul J. Lucas]

Now comparing name() to name().

Now comparing name() to name().

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-980463-2012-04-13T03-19-01.268Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-980463-2012-04-13T03-19-01.268Z 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, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Markos Zaharioudakis (markos-za)]

review: Approve

[Markos Zaharioudakis (markos-za)]

Daniel is not working for zorba anymore, so we shouldn't wait for him to approve this, right? If so, he should be removed as a reviewer. I don't know how to do this. Maybe by resubmitting the proposal?

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-980463-2012-04-13T12-20-54.451Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/bug-980463 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-980463-2012-04-13T12-20-54.451Z is finished. The
  final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-980463-2012-04-13T16-09-55.544Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/bug-980463 into lp:zorba failed. Below is the output from the failed tests.

Error copying directory from "/home/ceej/zo/testing/zorbatest/tester/trunk_merge_tree" to "/home/ceej/zo/testing/zorbatest/tester/remotequeue/bug-980463-2012-04-13T16-09-55.544Z/bzr/zorba".
CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-980463-2012-04-13T16-09-55.544Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in src/zorbaserialization/class_serializer.h

[lp:~paul-lucas/zorba/bug-980463]

10758. By Paul J. Lucas on 2012-04-14

Merge from trunk.

Unmerged revisions

=== modified file 'src/zorbaserialization/class_serializer.h'
--- src/zorbaserialization/class_serializer.h	2012-04-10 20:59:34 +0000
+++ src/zorbaserialization/class_serializer.h	2012-04-13 03:21:20 +0000
@@ -380,9 +380,9 @@
 ********************************************************************************/
 #ifndef NDEBUG
 #define CHECK_CLASS_NAME(class_name)\
-if (ar.is_serializing_out() && !ar.is_serialize_base_class())   \
-{                                                               \
-  assert(strstr(typeid(*this).name(), #class_name));            \
+if (ar.is_serializing_out() && !ar.is_serialize_base_class())             \
+{                                                                         \
+  assert(::strcmp(typeid(*this).name(), typeid(class_name).name()) == 0); \
 }
 #else
 #define CHECK_CLASS_NAME(class_name)