|
|
Boost-Commit : |
From: ramey_at_[hidden]
Date: 2008-06-26 01:56:16
Author: ramey
Date: 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
New Revision: 46703
URL: http://svn.boost.org/trac/boost/changeset/46703
Log:
make sure that headers are included which size_t
Text files modified:
trunk/boost/archive/basic_binary_oprimitive.hpp | 2 +-
trunk/boost/archive/basic_text_oprimitive.hpp | 2 +-
trunk/boost/archive/codecvt_null.hpp | 3 ++-
trunk/boost/archive/detail/polymorphic_iarchive_route.hpp | 6 +++---
trunk/boost/archive/impl/archive_pointer_iserializer.ipp | 11 +++++++----
trunk/boost/serialization/array.hpp | 11 +++++++++--
trunk/boost/serialization/collections_load_imp.hpp | 9 ++++++++-
trunk/boost/serialization/detail/shared_count_132.hpp | 7 +++++++
trunk/boost/serialization/serialization.hpp | 7 -------
trunk/boost/serialization/slist.hpp | 9 ++++++++-
10 files changed, 46 insertions(+), 21 deletions(-)
Modified: trunk/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oprimitive.hpp (original)
+++ trunk/boost/archive/basic_binary_oprimitive.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -26,9 +26,9 @@
#include <iosfwd>
#include <cassert>
#include <locale>
-#include <cstddef> // size_t
#include <streambuf> // basic_streambuf
#include <string>
+#include <cstddef> // size_t
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
Modified: trunk/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_oprimitive.hpp (original)
+++ trunk/boost/archive/basic_text_oprimitive.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -26,9 +26,9 @@
#include <iomanip>
#include <locale>
-#include <cstddef> // size_t
#include <cmath> // isnan
#include <cassert>
+#include <cstddef> // size_t
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
Modified: trunk/boost/archive/codecvt_null.hpp
==============================================================================
--- trunk/boost/archive/codecvt_null.hpp (original)
+++ trunk/boost/archive/codecvt_null.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <locale>
-#include <cstddef> // NULL
+#include <cstddef> // NULL, size_t
#include <cwchar> // for mbstate_t
#include <boost/config.hpp>
#include <boost/archive/detail/auto_link_archive.hpp>
@@ -25,6 +25,7 @@
#if defined(BOOST_NO_STDC_NAMESPACE)
using ::codecvt;
using ::mbstate_t;
+ using ::size_t
#endif
namespace boost {
Modified: trunk/boost/archive/detail/polymorphic_iarchive_route.hpp
==============================================================================
--- trunk/boost/archive/detail/polymorphic_iarchive_route.hpp (original)
+++ trunk/boost/archive/detail/polymorphic_iarchive_route.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -16,11 +16,9 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cstddef>
#include <string>
#include <ostream>
-#include <boost/noncopyable.hpp>
-#include <boost/cstdint.hpp>
+#include <cstddef>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
@@ -29,6 +27,8 @@
} // namespace std
#endif
+#include <boost/noncopyable.hpp>
+#include <boost/cstdint.hpp>
#include <boost/archive/polymorphic_iarchive.hpp>
#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
Modified: trunk/boost/archive/impl/archive_pointer_iserializer.ipp
==============================================================================
--- trunk/boost/archive/impl/archive_pointer_iserializer.ipp (original)
+++ trunk/boost/archive/impl/archive_pointer_iserializer.ipp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -10,8 +10,13 @@
#include <utility>
#include <cassert>
-
+#include <cstddef>
#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+} // namespace std
+#endif
#include <boost/serialization/singleton.hpp>
#include <boost/archive/detail/basic_serializer_map.hpp>
@@ -65,9 +70,7 @@
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
archive_pointer_iserializer<Archive>::~archive_pointer_iserializer(){
- // note: we need to check that the map still exists as we can't depend
- // on static variables being constructed in a specific sequence
- unsigned int count;
+ std::size_t count;
count = serialization::singleton<
iserializer_map<Archive>
>::get_mutable_instance().erase(this);
Modified: trunk/boost/serialization/array.hpp
==============================================================================
--- trunk/boost/serialization/array.hpp (original)
+++ trunk/boost/serialization/array.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -16,15 +16,22 @@
#include <boost/array.hpp>
#include <iostream>
-namespace boost { namespace serialization {
+#include <cstddef> // std::size_t
+#include <cstddef>
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+} // namespace std
+#endif
+namespace boost { namespace serialization {
// traits to specify whether to use an optimized array serialization
template <class Archive>
struct use_array_optimization : boost::mpl::always<boost::mpl::false_> {};
-
template<class T>
class array
: public wrapper_traits<array<T> >
Modified: trunk/boost/serialization/collections_load_imp.hpp
==============================================================================
--- trunk/boost/serialization/collections_load_imp.hpp (original)
+++ trunk/boost/serialization/collections_load_imp.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -23,7 +23,13 @@
// helper function templates for serialization of collections
#include <cassert>
-#include <boost/config.hpp>
+#include <cstddef> // size_t
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+} // namespace std
+#endif
#include <boost/detail/workaround.hpp>
#include <boost/serialization/access.hpp>
@@ -31,6 +37,7 @@
#include <boost/serialization/detail/stack_constructor.hpp>
#include <boost/serialization/collection_size_type.hpp>
+
namespace boost{
namespace serialization {
namespace stl {
Modified: trunk/boost/serialization/detail/shared_count_132.hpp
==============================================================================
--- trunk/boost/serialization/detail/shared_count_132.hpp (original)
+++ trunk/boost/serialization/detail/shared_count_132.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -38,6 +38,13 @@
#include <typeinfo> // std::type_info in get_deleter
#include <cstddef> // std::size_t
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+} // namespace std
+#endif
+
#ifdef __BORLANDC__
# pragma warn -8026 // Functions with excep. spec. are not expanded inline
# pragma warn -8027 // Functions containing try are not expanded inline
Modified: trunk/boost/serialization/serialization.hpp
==============================================================================
--- trunk/boost/serialization/serialization.hpp (original)
+++ trunk/boost/serialization/serialization.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -10,14 +10,7 @@
# pragma warning (disable : 4675) // suppress ADL warning
#endif
-#include <cstddef> // size_t
#include <boost/config.hpp>
-#if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{
- using ::size_t;
-} // namespace std
-#endif
-
#include <boost/strong_typedef.hpp>
#include <boost/pfto.hpp>
#include <boost/throw_exception.hpp>
Modified: trunk/boost/serialization/slist.hpp
==============================================================================
--- trunk/boost/serialization/slist.hpp (original)
+++ trunk/boost/serialization/slist.hpp 2008-06-26 01:56:15 EDT (Thu, 26 Jun 2008)
@@ -16,7 +16,14 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <boost/config.hpp>
+#include <cstddef> // size_t
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+} // namespace std
+#endif
+
#ifdef BOOST_HAS_SLIST
#include BOOST_SLIST_HEADER
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk