From 8f7b3be1d2104cdc6b5778653cf98ca4dc06a1e6 Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Sun, 24 Apr 2016 22:25:12 -0700 Subject: [PATCH] made headers stand alone --- .../archive/impl/basic_text_iprimitive.ipp | 4 ++-- .../archive_input_unordered_map.hpp | 3 ++- .../archive_input_unordered_set.hpp | 4 ++++ .../serialization/detail/stack_constructor.hpp | 4 ++-- include/boost/serialization/ephemeral.hpp | 1 - include/boost/serialization/factory.hpp | 1 + include/boost/serialization/forward_list.hpp | 6 +++--- include/boost/serialization/priority_queue.hpp | 2 ++ include/boost/serialization/queue.hpp | 2 ++ include/boost/serialization/stack.hpp | 2 ++ src/basic_xml_grammar.ipp | 17 +++++++++-------- test/Jamfile.v2 | 5 ----- 12 files changed, 29 insertions(+), 22 deletions(-) diff --git a/include/boost/archive/impl/basic_text_iprimitive.ipp b/include/boost/archive/impl/basic_text_iprimitive.ipp index 4e447280..1b281387 100644 --- a/include/boost/archive/impl/basic_text_iprimitive.ipp +++ b/include/boost/archive/impl/basic_text_iprimitive.ipp @@ -76,7 +76,7 @@ basic_text_iprimitive::load_binary( iterators::remove_whitespace< iterators::istream_iterator > - ,typename IStream::int_type + ,typename IStream::char_type > ,8 ,6 @@ -95,7 +95,7 @@ basic_text_iprimitive::load_binary( // skip over any excess input for(;;){ - typename IStream::int_type r; + typename IStream::char_type r; r = is.get(); if(is.eof()) break; diff --git a/include/boost/serialization/archive_input_unordered_map.hpp b/include/boost/serialization/archive_input_unordered_map.hpp index ef0fd93e..3c2fa8f0 100644 --- a/include/boost/serialization/archive_input_unordered_map.hpp +++ b/include/boost/serialization/archive_input_unordered_map.hpp @@ -19,7 +19,8 @@ // See http://www.boost.org for updates, documentation, and revision history. #include - +#include +#include #include namespace boost { diff --git a/include/boost/serialization/archive_input_unordered_set.hpp b/include/boost/serialization/archive_input_unordered_set.hpp index 961b58f1..55bd1475 100644 --- a/include/boost/serialization/archive_input_unordered_set.hpp +++ b/include/boost/serialization/archive_input_unordered_set.hpp @@ -17,6 +17,10 @@ // See http://www.boost.org for updates, documentation, and revision history. +#include +#include +#include + namespace boost { namespace serialization { diff --git a/include/boost/serialization/detail/stack_constructor.hpp b/include/boost/serialization/detail/stack_constructor.hpp index 806b8877..ae14832c 100644 --- a/include/boost/serialization/detail/stack_constructor.hpp +++ b/include/boost/serialization/detail/stack_constructor.hpp @@ -1,5 +1,5 @@ -#ifndef BOOST_SERIALIZATION_DETAIL_STACH_CONSTRUCTOR_HPP -#define BOOST_SERIALIZATION_DETAIL_STACH_CONSTRUCTOR_HPP +#ifndef BOOST_SERIALIZATION_DETAIL_STACK_CONSTRUCTOR_HPP +#define BOOST_SERIALIZATION_DETAIL_STACK_CONSTRUCTOR_HPP // MS compatible compilers support #pragma once #if defined(_MSC_VER) diff --git a/include/boost/serialization/ephemeral.hpp b/include/boost/serialization/ephemeral.hpp index 09e50161..3a422c30 100644 --- a/include/boost/serialization/ephemeral.hpp +++ b/include/boost/serialization/ephemeral.hpp @@ -2,7 +2,6 @@ #define BOOST_SERIALIZATION_EPHEMERAL_HPP // MS compatible compilers support -#pragma once #if defined(_MSC_VER) # pragma once #endif diff --git a/include/boost/serialization/factory.hpp b/include/boost/serialization/factory.hpp index 916d75d7..db5b1a92 100644 --- a/include/boost/serialization/factory.hpp +++ b/include/boost/serialization/factory.hpp @@ -21,6 +21,7 @@ #include #include +#include namespace std{ #if defined(__LIBCOMO__) diff --git a/include/boost/serialization/forward_list.hpp b/include/boost/serialization/forward_list.hpp index e1740538..5d79b372 100644 --- a/include/boost/serialization/forward_list.hpp +++ b/include/boost/serialization/forward_list.hpp @@ -16,14 +16,14 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include -#include // distance - #include #ifdef BOOST_NO_CXX11_HDR_FORWARD_LIST #error "not supported for versions earlier than c++11 #endif +#include +#include // distance + #include #include #include diff --git a/include/boost/serialization/priority_queue.hpp b/include/boost/serialization/priority_queue.hpp index 3ba63a5b..5b08ffd1 100644 --- a/include/boost/serialization/priority_queue.hpp +++ b/include/boost/serialization/priority_queue.hpp @@ -18,6 +18,8 @@ #include #include +#include +#include // function specializations must be defined in the appropriate // namespace - boost::serialization diff --git a/include/boost/serialization/queue.hpp b/include/boost/serialization/queue.hpp index 58e1ee92..b2274521 100644 --- a/include/boost/serialization/queue.hpp +++ b/include/boost/serialization/queue.hpp @@ -18,6 +18,8 @@ #include #include +#include +#include // function specializations must be defined in the appropriate // namespace - boost::serialization diff --git a/include/boost/serialization/stack.hpp b/include/boost/serialization/stack.hpp index aea3ba8e..96f90fe8 100644 --- a/include/boost/serialization/stack.hpp +++ b/include/boost/serialization/stack.hpp @@ -18,6 +18,8 @@ #include #include +#include +#include // function specializations must be defined in the appropriate // namespace - boost::serialization diff --git a/src/basic_xml_grammar.ipp b/src/basic_xml_grammar.ipp index 6dc6b58c..93a0120a 100644 --- a/src/basic_xml_grammar.ipp +++ b/src/basic_xml_grammar.ipp @@ -187,17 +187,18 @@ bool basic_xml_grammar::my_parse( std::basic_string arg; - CharType val; - do{ - typename basic_xml_grammar::IStream::int_type - result = is.get(); + for(;;){ + CharType result; + is.get(result); if(is.fail()) return false; - val = static_cast(result); - arg += val; + if(is.eof()) + return false; + arg += result; + if(result == delimiter) + break; } - while(val != delimiter); - + // read just one more character. This will be the newline after the tag // this is so that the next operation will return fail if the archive // is terminated. This will permit the archive to be used for debug diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 08fde1f1..d8997c06 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -141,11 +141,6 @@ if ! $(BOOST_ARCHIVE_LIST) { [ test-bsl-run test_iterators ] [ test-bsl-run test_iterators_base64 ] [ test-bsl-run test_smart_cast ] - [ test-bsl-run test_utf8_codecvt - : - : - : ../../config/test/all//BOOST_NO_STD_WSTREAMBUF - ] [ test-bsl-run test_codecvt_null : ../src/codecvt_null :