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

[Paul J. Lucas]

Now comparing name() to name().

Now comparing name() to name().

[Paul J. Lucas (paul-lucas)]

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-980463-2012-04-16T16-49-14.305Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-980463-2012-04-16T16-49-14.305Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/zorbaserialization/class_serializer.h'
--- src/zorbaserialization/class_serializer.h	2012-04-14 01:36:33 +0000
+++ src/zorbaserialization/class_serializer.h	2012-04-14 15:29:20 +0000
@@ -142,18 +142,16 @@
   class_name::serialize(ar);                                              \
 }
 
-
 #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)
 #endif
 
-
 /*******************************************************************************
   Every serializable class C has a nested member class D that is a subclass of
   ClassDeserializer. Furthermore, every serializable class has a static data
@@ -374,8 +372,6 @@
 {                                                                                \
 }
 
-
-
 } // namespace serialization
 } // namespace zorba