From 7565de40089c0bbfca89d9aa25541ef233bc52c5 Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Wed, 22 Apr 2015 09:32:58 -0700 Subject: [PATCH] transitory changes attempting to resolve visibility for minnow --- include/boost/archive/archive_exception.hpp | 3 +- include/boost/archive/detail/basic_config.hpp | 45 ------------------- include/boost/archive/detail/decl.hpp | 4 ++ .../archive/detail/helper_collection.hpp | 2 +- include/boost/serialization/config.hpp | 33 +++++++------- src/archive_exception.cpp | 1 - 6 files changed, 25 insertions(+), 63 deletions(-) delete mode 100644 include/boost/archive/detail/basic_config.hpp diff --git a/include/boost/archive/archive_exception.hpp b/include/boost/archive/archive_exception.hpp index 7861fb5f..1159d277 100644 --- a/include/boost/archive/archive_exception.hpp +++ b/include/boost/archive/archive_exception.hpp @@ -42,6 +42,7 @@ namespace archive { class BOOST_SYMBOL_VISIBLE archive_exception : public virtual std::exception { +private: char m_buffer[128]; protected: BOOST_ARCHIVE_DECL unsigned int @@ -79,8 +80,8 @@ public: // type has been instantiated in more than one module. output_stream_error // error on input stream } exception_code; - exception_code code; + BOOST_ARCHIVE_DECL archive_exception( exception_code c, const char * e1 = NULL, diff --git a/include/boost/archive/detail/basic_config.hpp b/include/boost/archive/detail/basic_config.hpp deleted file mode 100644 index 18e69571..00000000 --- a/include/boost/archive/detail/basic_config.hpp +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef BOOST_ARCHIVE_DETAIL_BASIC_CONFIG_HPP -#define BOOST_ARCHIVE_DETAIL_BASIC_CONFIG_HPP - -// MS compatible compilers support #pragma once -#if defined(_MSC_VER) -# pragma once -#endif - -// basic_config.hpp ---------------------------------------------// - -// (c) Copyright Robert Ramey 2004 -// Use, modification, and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// See library home page at http://www.boost.org/libs/serialization - -//----------------------------------------------------------------------------// - -// This header implements separate compilation features as described in -// http://www.boost.org/more/separate_compilation.html - -#include - -#ifdef BOOST_HAS_DECLSPEC // defined in config system -// we need to import/export our code only if the user has specifically -// asked for it by defining either BOOST_ALL_DYN_LINK if they want all boost -// libraries to be dynamically linked, or BOOST_ARCHIVE_DYN_LINK -// if they want just this one to be dynamically linked: -#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_ARCHIVE_DYN_LINK) -// export if this is our own source, otherwise import: -#ifdef BOOST_ARCHIVE_SOURCE -# define BOOST_ARCHIVE_DECL BOOST_SYMBOL_EXPORT -#else -# define BOOST_ARCHIVE_DECL BOOST_SYMBOL_IMPORT -#endif // BOOST_ARCHIVE_SOURCE -#endif // DYN_LINK -#endif // BOOST_HAS_DECLSPEC -// -// if BOOST_ARCHIVE_DECL isn't defined yet define it now: -#ifndef BOOST_ARCHIVE_DECL -#define BOOST_ARCHIVE_DECL -#endif - -#endif // BOOST_ARCHIVE_DETAIL_BASIC_CONFIG_HPP diff --git a/include/boost/archive/detail/decl.hpp b/include/boost/archive/detail/decl.hpp index b5dd12e5..ae67fb23 100644 --- a/include/boost/archive/detail/decl.hpp +++ b/include/boost/archive/detail/decl.hpp @@ -28,6 +28,7 @@ #if defined(BOOST_ARCHIVE_SOURCE) #define BOOST_ARCHIVE_DECL BOOST_SYMBOL_EXPORT #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_EXPORT + #define BOOST_SYMBOL_VISIBLE BOOST_SYMBOL_EXPORT #else #define BOOST_ARCHIVE_DECL BOOST_SYMBOL_IMPORT #endif @@ -53,4 +54,7 @@ #define BOOST_ARCHIVE_OR_WARCHIVE_DECL #endif +#undef BOOST_SYMBOL_VISIBLE +#define BOOST_SYMBOL_VISIBLE BOOST_ARCHIVE_DECL + #endif // BOOST_ARCHIVE_DETAIL_DECL_HPP diff --git a/include/boost/archive/detail/helper_collection.hpp b/include/boost/archive/detail/helper_collection.hpp index cf457135..edb4125e 100644 --- a/include/boost/archive/detail/helper_collection.hpp +++ b/include/boost/archive/detail/helper_collection.hpp @@ -55,7 +55,7 @@ class helper_collection collection m_collection; struct predicate { - BOOST_DELETED_FUNCTION(predicate & operator=(const predicate & rhs)); + BOOST_DELETED_FUNCTION(predicate & operator=(const predicate & rhs)) public: const void * const m_ti; bool operator()(helper_value_type const &rhs) const { diff --git a/include/boost/serialization/config.hpp b/include/boost/serialization/config.hpp index fa6a5787..8e5ac9cf 100644 --- a/include/boost/serialization/config.hpp +++ b/include/boost/serialization/config.hpp @@ -28,21 +28,21 @@ #endif #ifdef BOOST_HAS_DECLSPEC // defined in config system -// we need to import/export our code only if the user has specifically -// asked for it by defining either BOOST_ALL_DYN_LINK if they want all boost -// libraries to be dynamically linked, or BOOST_SERIALIZATION_DYN_LINK -// if they want just this one to be dynamically liked: -#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK) - #if !defined(BOOST_DYN_LINK) - #define BOOST_DYN_LINK - #endif - // export if this is our own source, otherwise import: - #if defined(BOOST_SERIALIZATION_SOURCE) - #define BOOST_SERIALIZATION_DECL BOOST_SYMBOL_EXPORT - #else - #define BOOST_SERIALIZATION_DECL BOOST_SYMBOL_IMPORT - #endif // defined(BOOST_SERIALIZATION_SOURCE) -#endif // defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK) + // we need to import/export our code only if the user has specifically + // asked for it by defining either BOOST_ALL_DYN_LINK if they want all boost + // libraries to be dynamically linked, or BOOST_SERIALIZATION_DYN_LINK + // if they want just this one to be dynamically liked: + #if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK) + #if !defined(BOOST_DYN_LINK) + #define BOOST_DYN_LINK + #endif + // export if this is our own source, otherwise import: + #if defined(BOOST_SERIALIZATION_SOURCE) + #define BOOST_SERIALIZATION_DECL BOOST_SYMBOL_EXPORT + #else + #define BOOST_SERIALIZATION_DECL BOOST_SYMBOL_IMPORT + #endif // defined(BOOST_SERIALIZATION_SOURCE) + #endif // defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK) #endif // BOOST_HAS_DECLSPEC // if BOOST_SERIALIZATION_DECL isn't defined yet define it now: @@ -50,6 +50,9 @@ #define BOOST_SERIALIZATION_DECL #endif +#undef BOOST_SYMBOL_VISIBLE +#define BOOST_SYMBOL_VISIBLE BOOST_SERIALIZATION_DECL + // enable automatic library variant selection ------------------------------// #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SERIALIZATION_NO_LIB) \ diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp index d9b07934..b850f899 100644 --- a/src/archive_exception.cpp +++ b/src/archive_exception.cpp @@ -13,7 +13,6 @@ #endif #include -//#include #include #define BOOST_ARCHIVE_SOURCE