[Boost-commit] svn:boost r51946 - trunk/libs/serialization/test

Subject: [Boost-commit] svn:boost r51946 - trunk/libs/serialization/test
From: ramey_at_[hidden]
Date: 2009-03-23 13:55:51

Author: ramey
Date: 2009-03-23 13:55:51 EDT (Mon, 23 Mar 2009)
New Revision: 51946
URL: http://svn.boost.org/trac/boost/changeset/51946

Log:
corrections for some SUN compilers
Text files modified: 
   trunk/libs/serialization/test/test_non_default_ctor2.cpp |     2 +-                                      
   trunk/libs/serialization/test/test_utf8_codecvt.cpp      |    11 +++++++++++                             
   2 files changed, 12 insertions(+), 1 deletions(-)

Modified: trunk/libs/serialization/test/test_non_default_ctor2.cpp
==============================================================================
--- trunk/libs/serialization/test/test_non_default_ctor2.cpp	(original)
+++ trunk/libs/serialization/test/test_non_default_ctor2.cpp	2009-03-23 13:55:51 EDT (Mon, 23 Mar 2009)
@@ -105,7 +105,7 @@
 }
 
 template <class ArchiveT>
-void load_construct_data(ArchiveT& archive, A* p, unsigned int version)
+void load_construct_data(ArchiveT& archive, A* p, const unsigned int version)
 {
     IntValueHolder initialValue;
     archive & boost::serialization::make_nvp("initialValue", initialValue);

Modified: trunk/libs/serialization/test/test_utf8_codecvt.cpp
==============================================================================
--- trunk/libs/serialization/test/test_utf8_codecvt.cpp	(original)
+++ trunk/libs/serialization/test/test_utf8_codecvt.cpp	2009-03-23 13:55:51 EDT (Mon, 23 Mar 2009)
@@ -26,6 +26,17 @@
 } // namespace std
 #endif
 
+// Note: copied from boost/iostreams/char_traits.hpp
+//
+// Dinkumware that comes with QNX Momentics 6.3.0, 4.0.2, incorrectly defines
+// the EOF and WEOF macros to not std:: qualify the wint_t type (and so does
+// Sun C++ 5.8 + STLport 4). Fix by placing the def in this scope.
+// NOTE: Use BOOST_WORKAROUND?
+#if (defined(__QNX__) && defined(BOOST_DINKUMWARE_STDLIB))  \
+    || defined(__SUNPRO_CC)
+using ::std::wint_t;
+#endif
+
 #include "test_tools.hpp"
 #include <boost/archive/iterators/istream_iterator.hpp>
 #include <boost/archive/iterators/ostream_iterator.hpp>