From 24fb09cb3ee865da0ce9bd2511617f84fdb223af Mon Sep 17 00:00:00 2001
From: Conrad Poelman <cpboost@stellarscience.com>
Date: Mon, 30 Apr 2018 16:26:21 -0400
Subject: [PATCH] Eliminate dllexport compile and link warnings per
https://svn.boost.org/trac10/ticket/13286#trac-add-comment .
---
boost/archive/codecvt_null.hpp | 4 ++--
boost/serialization/singleton.hpp | 2 +-
libs/serialization/src/codecvt_null.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/boost/archive/codecvt_null.hpp b/boost/archive/codecvt_null.hpp
index 7bce2b9b3..78b10cf4d 100644
a
|
b
|
public:
|
65 | 65 | template<> |
66 | 66 | class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t> |
67 | 67 | { |
68 | | virtual BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result |
| 68 | virtual BOOST_DLLEXPORT std::codecvt_base::result |
69 | 69 | do_out( |
70 | 70 | std::mbstate_t & state, |
71 | 71 | const wchar_t * first1, |
… |
… |
class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t,
|
75 | 75 | char * last2, |
76 | 76 | char * & next2 |
77 | 77 | ) const BOOST_USED; |
78 | | virtual BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result |
| 78 | virtual BOOST_DLLEXPORT std::codecvt_base::result |
79 | 79 | do_in( |
80 | 80 | std::mbstate_t & state, |
81 | 81 | const char * first1, |
diff --git a/boost/serialization/singleton.hpp b/boost/serialization/singleton.hpp
index b50afedbb..2481c76e6 100644
a
|
b
|
class BOOST_SYMBOL_VISIBLE singleton_module :
|
91 | 91 | public boost::noncopyable |
92 | 92 | { |
93 | 93 | private: |
94 | | BOOST_SERIALIZATION_DECL BOOST_DLLEXPORT static bool & get_lock() BOOST_USED; |
| 94 | BOOST_DLLEXPORT static bool & get_lock() BOOST_USED; |
95 | 95 | public: |
96 | 96 | BOOST_DLLEXPORT static void lock(){ |
97 | 97 | get_lock() = true; |
diff --git a/libs/serialization/src/codecvt_null.cpp b/libs/serialization/src/codecvt_null.cpp
index 5506348e1..642b455bf 100644
a
|
b
|
|
18 | 18 | namespace boost { |
19 | 19 | namespace archive { |
20 | 20 | |
21 | | BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result |
| 21 | BOOST_DLLEXPORT std::codecvt_base::result |
22 | 22 | codecvt_null<wchar_t>::do_out( |
23 | 23 | std::mbstate_t & /*state*/, |
24 | 24 | const wchar_t * first1, |
… |
… |
codecvt_null<wchar_t>::do_out(
|
46 | 46 | return std::codecvt_base::ok; |
47 | 47 | } |
48 | 48 | |
49 | | BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result |
| 49 | BOOST_DLLEXPORT std::codecvt_base::result |
50 | 50 | codecvt_null<wchar_t>::do_in( |
51 | 51 | std::mbstate_t & /*state*/, |
52 | 52 | const char * first1, |