Ticket #1335: boost.archive.diff

archive/basic_binary_oprimitive.hpp

@@ -168 +168 @@
 } //namespace boost 
 } //namespace archive 
 
-#include <boost/archive/detail/abi_suffix.hpp> // pop pragams
+#include <boost/archive/detail/abi_suffix.hpp> // pop pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_BINARY_OPRIMITIVE_HPP

archive/basic_text_oprimitive.hpp

@@ -30 +30 @@
 #include <cmath> // isnan
 #include <cassert>
 
+#include <boost/archive/detail/auto_link_archive.hpp> // BOOST_ARCHIVE_OR_WARCHIVE_DECL
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 #if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)

archive/basic_xml_archive.hpp

@@ -36 +36 @@
         xml_archive_tag_mismatch,
         xml_archive_tag_name_error
     } exception_code;
-    xml_archive_exception(exception_code c)
+    xml_archive_exception(exception_code)
     {}
     virtual const char *what( ) const throw( )
     {

archive/impl/basic_binary_oprimitive.ipp

@@ -70 +70 @@
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
 basic_binary_oprimitive<Archive, Elem, Tr>::save(const std::string &s)
 {
+    // FIXME: Why not casting to std::size_t??
     std::size_t l = static_cast<unsigned int>(s.size());
     this->This()->save(l);
     save_binary(s.data(), l);

archive/detail/common_iarchive.hpp

@@ -60 +60 @@
     }
     // default implementations of functions which emit start/end tags for
     // archive types that require them.
-    void load_start(const char *name){}
-    void load_end(const char *name){}
+    void load_start(const char * /*name*/){}
+    void load_end(const char * /*name*/){}
     // default archive initialization
     common_iarchive(unsigned int flags = 0) : 
         basic_iarchive(flags),

archive/detail/iserializer.hpp

@@ -501 +501 @@
         
         // convert integers to correct enum to load
         int current_count = sizeof(t) / (
+            // FIXME: Why cast twice? To get the maximal alignment????
             static_cast<char *>(static_cast<void *>(&t[1])) 
             - static_cast<char *>(static_cast<void *>(&t[0]))
         );

archive/iterators/dataflow.hpp

@@ -43 +43 @@
     enum state_enum {
         is_false = false,
         is_true = true,
-        is_indeterminant,
+        is_indeterminant
     } m_state;
     // convert to bool
     operator bool (){
@@ -53 +53 @@
     // assign from bool
     tri_state & operator=(bool rhs) {
         m_state = rhs ? is_true : is_false;
+        return *this;
     }
     tri_state(bool rhs) :
         m_state(rhs ? is_true : is_false)

archive/iterators/head_iterator.hpp

@@ -48 +48 @@
 
     reference_type dereference_impl(){
         if(! m_end){
-            while(! m_predicate(* base_reference()))
-                ++ base_reference();
+            while(! m_predicate(* this->base_reference()))
+                ++ this->base_reference();
             m_end = true;
         }
-        return * base_reference();
+        return * this->base_reference();
     }
 
     reference_type dereference() const {
@@ -60 +60 @@
     }
 
     void increment(){
-        ++base_reference();
+        ++this->base_reference();
     }
     Predicate m_predicate;
     bool m_end;

archive/tmpdir.hpp

@@ -17 +17 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstdlib> // getenv
-#include <cassert>
+//#include <cassert>
 
 #include <boost/config.hpp>
 #ifdef BOOST_NO_STDC_NAMESPACE
@@ -29 +29 @@
 namespace boost {
 namespace archive {
 
-inline char * tmpdir(){
-    char *dirname;
+inline const char * tmpdir(){
+    const char *dirname;
     dirname = std::getenv("TMP");
     if(NULL == dirname)
         dirname = std::getenv("TMPDIR");

archive/codecvt_null.hpp

@@ -22 +22 @@
 #include <boost/config.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 
+// FIXME: Is the following missing (similar at end)????
+// #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
+
 namespace std{
     #if defined(__LIBCOMO__)
         using ::mbstate_t;

archive/basic_binary_iprimitive.hpp

@@ -143 +143 @@
         static_cast<Elem *>(address), 
         s
     );
-    if(scount != static_cast<std::streamsize>(s))
+    if(scount != s)
         boost::throw_exception(
             archive_exception(archive_exception::stream_error)
         );

archive/basic_text_iprimitive.hpp

@@ -16 +16 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-// archives stored as text - note these ar templated on the basic
+// archives stored as text - note these are templated on the basic
 // stream templates to accommodate wide (and other?) kind of characters
 //
-// note the fact that on libraries without wide characters, ostream is
-// is not a specialization of basic_ostream which in fact is not defined
+// Note the fact that on libraries without wide characters, ostream is
+// not a specialization of basic_ostream which in fact is not defined
 // in such cases.   So we can't use basic_ostream<IStream::char_type> but rather
 // use two template parameters
 
@@ -28 +28 @@
 #include <locale>
 #include <cstddef> // size_t
 
+#include <boost/archive/detail/auto_link_archive.hpp> // BOOST_ARCHIVE_OR_WARCHIVE_DECL
+
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
@@ -125 +127 @@
 } // namespace archive
 } // namespace boost
 
-#include <boost/archive/detail/abi_suffix.hpp> // pop pragams
+#include <boost/archive/detail/abi_suffix.hpp> // pop pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_TEXT_IPRIMITIVE_HPP