--- codecvt_null.hpp	2009-04-01 19:58:26.481713000 +0400
+++ codecvt_null_fixed.hpp	2009-09-08 14:10:12.463462700 +0400
@@ -24,13 +24,16 @@
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 #if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std
+{
 // For STLport on WinCE, BOOST_NO_STDC_NAMESPACE can get defined if STLport is putting symbols in its own namespace.
 // In the case of codecvt, however, this does not mean that codecvt is in the global namespace (it will be in STLport's namespace)
-#  if !defined(UNDER_CE) || (!defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION))
+#  if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
     using ::codecvt;
 #  endif
     using ::mbstate_t;
     using ::size_t;
+} // namespace std
 #endif
 
 namespace boost {