From 49a851317a3696f49f9ee6ce1dee20ee9dece3ae Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 16 Aug 2016 14:27:02 +0200 Subject: Try to clean up inline exports --- odb/details/c-string.hxx | 4 +--- odb/details/condition.hxx | 3 +-- odb/details/exception.hxx | 6 +----- odb/details/lock.hxx | 3 +-- odb/details/mutex.hxx | 3 +-- odb/details/shared-ptr/base.hxx | 2 +- odb/details/shared-ptr/base.txx | 2 +- odb/details/type-info.hxx | 4 +--- 8 files changed, 8 insertions(+), 19 deletions(-) (limited to 'odb/details') diff --git a/odb/details/c-string.hxx b/odb/details/c-string.hxx index c4739a4..79c5689 100644 --- a/odb/details/c-string.hxx +++ b/odb/details/c-string.hxx @@ -9,13 +9,11 @@ #include -#include - namespace odb { namespace details { - struct LIBODB_EXPORT c_string_comparator + struct c_string_comparator { bool operator() (const char* x, const char* y) const diff --git a/odb/details/condition.hxx b/odb/details/condition.hxx index 1baa81b..34c5c62 100644 --- a/odb/details/condition.hxx +++ b/odb/details/condition.hxx @@ -8,7 +8,6 @@ #include #include -#include #ifdef ODB_THREADS_NONE @@ -19,7 +18,7 @@ namespace odb class mutex; class lock; - class LIBODB_EXPORT condition + class condition { public: condition (mutex&) {} diff --git a/odb/details/exception.hxx b/odb/details/exception.hxx index 6838801..37ee1c9 100644 --- a/odb/details/exception.hxx +++ b/odb/details/exception.hxx @@ -9,15 +9,11 @@ #include -#include - namespace odb { namespace details { - struct LIBODB_EXPORT exception: odb::exception - { - }; + struct exception: odb::exception {}; } } diff --git a/odb/details/lock.hxx b/odb/details/lock.hxx index 28f3ede..afc4c7b 100644 --- a/odb/details/lock.hxx +++ b/odb/details/lock.hxx @@ -7,7 +7,6 @@ #include -#include #include #ifdef ODB_THREADS_CXX11 @@ -24,7 +23,7 @@ namespace odb { namespace details { - class LIBODB_EXPORT lock + class lock { public: lock (mutex& m) diff --git a/odb/details/mutex.hxx b/odb/details/mutex.hxx index 2508f68..a0adc33 100644 --- a/odb/details/mutex.hxx +++ b/odb/details/mutex.hxx @@ -8,7 +8,6 @@ #include #include -#include #ifdef ODB_THREADS_NONE @@ -16,7 +15,7 @@ namespace odb { namespace details { - class LIBODB_EXPORT mutex + class mutex { public: mutex () {} diff --git a/odb/details/shared-ptr/base.hxx b/odb/details/shared-ptr/base.hxx index 90053e8..a0a6ae2 100644 --- a/odb/details/shared-ptr/base.hxx +++ b/odb/details/shared-ptr/base.hxx @@ -18,7 +18,7 @@ namespace odb { namespace details { - struct LIBODB_EXPORT share + struct share { explicit share (char id); diff --git a/odb/details/shared-ptr/base.txx b/odb/details/shared-ptr/base.txx index d018c88..c15f508 100644 --- a/odb/details/shared-ptr/base.txx +++ b/odb/details/shared-ptr/base.txx @@ -13,7 +13,7 @@ namespace odb { // Support for locating the counter in the memory block. // - struct LIBODB_EXPORT locator_common + struct locator_common { static std::size_t* counter (void*); diff --git a/odb/details/type-info.hxx b/odb/details/type-info.hxx index 96d2cc8..5a4f9ec 100644 --- a/odb/details/type-info.hxx +++ b/odb/details/type-info.hxx @@ -9,13 +9,11 @@ #include -#include - namespace odb { namespace details { - struct LIBODB_EXPORT type_info_comparator + struct type_info_comparator { bool operator() (const std::type_info* x, const std::type_info* y) const -- cgit v1.1