Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Fixed to_string() for char* type.

Fixed to_string() for char* type.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-25T22-49-47.678Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2013-01-25T22-49-47.678Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

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/pjl-misc-2013-01-26T01-31-45.923Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2013-01-26T01-31-45.923Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

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/pjl-misc-2013-01-26T16-39-50.663Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-01-26T16-39-50.663Z 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 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/pjl-misc-2013-01-28T22-08-14.979Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-01-28T22-08-14.979Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/internal/ztd.h'
--- include/zorba/internal/ztd.h	2012-12-08 00:09:48 +0000
+++ include/zorba/internal/ztd.h	2013-01-26 16:33:24 +0000
@@ -260,16 +260,35 @@
 
 /**
  * \internal
+ * Tests whether a given type \a T is a C string type.
+ *
+ * @tparam T The type to check.
+ */
+template<typename T>
+class is_c_string {
+  typedef typename ZORBA_TR1_NS::remove_pointer<T>::type T_base;
+  typedef typename ZORBA_TR1_NS::add_const<T_base>::type T_base_const;
+public:
+  static bool const value =
+       ZORBA_TR1_NS::is_same<T_base_const*,char const*>::value
+    || ZORBA_TR1_NS::is_same<T_base_const*,unsigned char const*>::value
+    || ZORBA_TR1_NS::is_same<T_base_const*,signed char const*>::value;
+};
+
+/**
+ * \internal
  * Converts an object to its string representation.
  *
  * @tparam T The object type that:
+ *  - is not an array
  *  - is not a pointer
  *  - has an <code>ostream& operator&lt;&lt;(ostream&,T const&)</code> defined
  * @param t The object.
  * @return Returns a string representation of the object.
  */
 template<typename T> inline
-typename std::enable_if<!ZORBA_TR1_NS::is_pointer<T>::value
+typename std::enable_if<!ZORBA_TR1_NS::is_array<T>::value
+                     && !ZORBA_TR1_NS::is_pointer<T>::value
                      && has_insertion_operator<T>::value,
                         std::string>::type
 to_string( T const &t ) {
@@ -345,7 +364,7 @@
 
 /**
  * \internal
- * Specialization of \c to_string() for pointer types.
+ * Specialization of \c to_string() for pointer types other than C strings.
  *
  * @tparam T The pointer type.
  * @param p The pointer.
@@ -353,10 +372,13 @@
  * otherwise returns \c "<null>".
  */
 template<typename T> inline
-typename std::enable_if<ZORBA_TR1_NS::is_pointer<T>::value,std::string>::type
+typename std::enable_if<ZORBA_TR1_NS::is_pointer<T>::value
+                     && !is_c_string<T>::value,
+                        std::string>::type
 to_string( T p ) {
-  typedef typename ZORBA_TR1_NS::remove_pointer<T>::type const* T_const_ptr;
-  return p ? to_string( *static_cast<T_const_ptr>( p ) ) : "<null>";
+  typedef typename ZORBA_TR1_NS::remove_pointer<T>::type T_base;
+  typedef typename ZORBA_TR1_NS::add_const<T_base>::type T_base_const;
+  return p ? to_string( *static_cast<T_base_const*>( p ) ) : "<null>";
 }
 
 /**
@@ -370,6 +392,17 @@
   return s ? s : "<null>";
 }
 
+/**
+ * \internal
+ * Specialization of \c to_string() for C strings.
+ *
+ * @param s The C string.
+ * @return Returns a string representation of the object.
+ */
+inline std::string to_string( unsigned char const *s ) {
+  return s ? reinterpret_cast<char const*>( s ) : "<null>";
+}
+
 ////////// misc ///////////////////////////////////////////////////////////////
 
 /**