Index: codecvt_null.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/archive/codecvt_null.hpp,v
retrieving revision 1.15
diff -u -r1.15 codecvt_null.hpp
--- codecvt_null.hpp	28 Sep 2006 16:31:49 -0000	1.15
+++ codecvt_null.hpp	16 May 2007 16:47:59 -0000
@@ -20,6 +20,7 @@
 #include <cstddef>
 
 #include <boost/config.hpp>
+#include <boost/archive/detail/auto_link_archive.hpp>
 
 namespace std{
     #if defined(__LIBCOMO__)
@@ -56,7 +57,7 @@
 template<>
 class codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t>
 {
-    virtual std::codecvt_base::result
+    virtual BOOST_ARCHIVE_OR_WARCHIVE_DECL(std::codecvt_base::result)
     do_out(
         std::mbstate_t & state,
         const wchar_t * first1,
@@ -66,7 +67,7 @@
         char * last2,
         char * & next2
     ) const;
-    virtual std::codecvt_base::result
+    virtual BOOST_ARCHIVE_OR_WARCHIVE_DECL(std::codecvt_base::result)
     do_in(
         std::mbstate_t & state,
         const char * first1,