[Boost-commit] svn:boost r42282 - branches/serialization_next_release/boost/libs/serialization/src

From: ramey_at_[hidden]
Date: 2007-12-24 19:08:56

Author: ramey
Date: 2007-12-24 19:08:55 EST (Mon, 24 Dec 2007)
New Revision: 42282
URL: http://svn.boost.org/trac/boost/changeset/42282

Log:
Adjustments for trak tickets - ready for upload as version 1.36.0
Text files modified: 
   branches/serialization_next_release/boost/libs/serialization/src/basic_xml_grammar.ipp  |     7 ++++---                                 
   branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp |     2 --                                      
   2 files changed, 4 insertions(+), 5 deletions(-)

Modified: branches/serialization_next_release/boost/libs/serialization/src/basic_xml_grammar.ipp
==============================================================================
--- branches/serialization_next_release/boost/libs/serialization/src/basic_xml_grammar.ipp	(original)
+++ branches/serialization_next_release/boost/libs/serialization/src/basic_xml_grammar.ipp	2007-12-24 19:08:55 EST (Mon, 24 Dec 2007)
@@ -29,6 +29,7 @@
 #include <boost/io/ios_state.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/archive/impl/basic_xml_grammar.hpp>
+#include <boost/archive/xml_archive_exception.hpp>
 #include <boost/archive/basic_xml_archive.hpp>
 #include <boost/archive/iterators/xml_unescape.hpp>
 
@@ -269,7 +270,7 @@
     ;
 
     // refactoring to workaround template depth on darwin
-    CharDataChars = *(anychar_p - chset_p(L"&<"));
+    CharDataChars = +(anychar_p - chset_p(L"&<"));
     CharData =  
         CharDataChars [
             xml::append_string<
@@ -305,7 +306,7 @@
 
     content = 
         L"<" // should be end_p
-        | (Reference | CharData) >> content
+        | +(Reference | CharData) >> L"<"
     ;
 
     ClassIDAttribute = 
@@ -368,7 +369,7 @@
         Name
         >> Eq
         >> L'"'
-        >> CharData
+        >> !CharData
         >> L'"'
     ;
 

Modified: branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp
==============================================================================
--- branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp	(original)
+++ branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp	2007-12-24 19:08:55 EST (Mon, 24 Dec 2007)
@@ -19,8 +19,6 @@
 
 #include <boost/config.hpp> // msvc needs this to suppress warning
 
-#include "bidirectional_map.hpp"
-
 #include <cstring>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ using ::strcmp; }