Merge branch 'develop'
This commit is contained in:
commit
9f8ccdc7fb
@ -1,6 +1,6 @@
|
||||
/* Boost.Flyweight test of intermodule_holder.
|
||||
*
|
||||
* Copyright 2006-2008 Joaquin M Lopez Munoz.
|
||||
* Copyright 2006-2018 Joaquin M Lopez Munoz.
|
||||
* Distributed under 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)
|
||||
@ -23,14 +23,10 @@
|
||||
#include <boost/flyweight/simple_locking.hpp>
|
||||
#include <string>
|
||||
|
||||
#ifdef BOOST_HAS_DECLSPEC
|
||||
#ifdef BOOST_FLYWEIGHT_TEST_INTERMOD_HOLDER_DLL_SOURCE
|
||||
#define BOOST_FLYWEIGHT_DLL_DECL __declspec(dllexport)
|
||||
#define BOOST_FLYWEIGHT_DLL_DECL BOOST_SYMBOL_EXPORT
|
||||
#else
|
||||
#define BOOST_FLYWEIGHT_DLL_DECL __declspec(dllimport)
|
||||
#endif
|
||||
#else
|
||||
#define BOOST_FLYWEIGHT_DLL_DECL
|
||||
#define BOOST_FLYWEIGHT_DLL_DECL BOOST_SYMBOL_IMPORT
|
||||
#endif
|
||||
|
||||
typedef boost::flyweights::flyweight<
|
||||
|
Loading…
Reference in New Issue
Block a user