diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-16 14:00:00 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-16 14:03:36 +0200 |
commit | 9e6d8d7e4619c1c0becbc385f1faaed62fdaa10e (patch) | |
tree | af0362a3c7bd9c91200c1af1b9fafd6476c5f46e | |
parent | 8a18a5f4b0ed4ecedf675a2e5319386d16e9cd12 (diff) |
Try to clean up inline exports2.5.0-a9
-rw-r--r-- | odb/sqlite/binding.hxx | 3 | ||||
-rw-r--r-- | odb/sqlite/blob-stream.cxx | 7 | ||||
-rw-r--r-- | odb/sqlite/blob-stream.hxx | 3 | ||||
-rw-r--r-- | odb/sqlite/blob.hxx | 3 | ||||
-rw-r--r-- | odb/sqlite/buildfile | 4 | ||||
-rw-r--r-- | odb/sqlite/makefile | 2 | ||||
-rw-r--r-- | odb/sqlite/query.hxx | 2 | ||||
-rw-r--r-- | odb/sqlite/statement.hxx | 2 | ||||
-rw-r--r-- | odb/sqlite/text-stream.cxx | 7 | ||||
-rw-r--r-- | odb/sqlite/text-stream.hxx | 3 | ||||
-rw-r--r-- | odb/sqlite/text.hxx | 2 | ||||
-rw-r--r-- | odb/sqlite/traits.hxx | 28 |
12 files changed, 19 insertions, 47 deletions
diff --git a/odb/sqlite/binding.hxx b/odb/sqlite/binding.hxx index f6cef5b..aa6a3cc 100644 --- a/odb/sqlite/binding.hxx +++ b/odb/sqlite/binding.hxx @@ -12,13 +12,12 @@ #include <odb/forward.hxx> #include <odb/sqlite/sqlite-types.hxx> -#include <odb/sqlite/details/export.hxx> namespace odb { namespace sqlite { - class LIBODB_SQLITE_EXPORT binding + class binding { public: typedef sqlite::bind bind_type; diff --git a/odb/sqlite/blob-stream.cxx b/odb/sqlite/blob-stream.cxx deleted file mode 100644 index 4bcedeb..0000000 --- a/odb/sqlite/blob-stream.cxx +++ /dev/null @@ -1,7 +0,0 @@ -// file : odb/sqlite/blob-stream.cxx -// copyright : Copyright (c) 2005-2015 Code Synthesis Tools CC -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/sqlite/blob-stream.hxx> - -// Dummy source file to get Win32 DLL export working. diff --git a/odb/sqlite/blob-stream.hxx b/odb/sqlite/blob-stream.hxx index 58be6ba..a2a1727 100644 --- a/odb/sqlite/blob-stream.hxx +++ b/odb/sqlite/blob-stream.hxx @@ -9,13 +9,12 @@ #include <odb/sqlite/blob.hxx> #include <odb/sqlite/stream.hxx> -#include <odb/sqlite/details/export.hxx> namespace odb { namespace sqlite { - class LIBODB_SQLITE_EXPORT blob_stream: public stream + class blob_stream: public stream { public: blob_stream (const blob& b, bool rw) diff --git a/odb/sqlite/blob.hxx b/odb/sqlite/blob.hxx index eccb3ab..8c1b197 100644 --- a/odb/sqlite/blob.hxx +++ b/odb/sqlite/blob.hxx @@ -14,7 +14,6 @@ // #ifndef ODB_COMPILER # include <odb/sqlite/forward.hxx> -# include <odb/sqlite/details/export.hxx> #endif namespace odb @@ -25,7 +24,7 @@ namespace odb #pragma db sqlite:type("BLOB STREAM") class blob #else - class LIBODB_SQLITE_EXPORT blob + class blob #endif { public: diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile index 94d5f2a..f4c5ed5 100644 --- a/odb/sqlite/buildfile +++ b/odb/sqlite/buildfile @@ -9,7 +9,7 @@ lib{odb-sqlite}: \ {hxx }{ auto-handle } \ {hxx }{ binding } \ {hxx }{ blob } \ - {hxx cxx}{ blob-stream } \ + {hxx }{ blob-stream } \ {hxx ixx cxx}{ connection } \ {hxx cxx}{ connection-factory } \ {hxx txx }{ container-statements } \ @@ -34,7 +34,7 @@ lib{odb-sqlite}: \ {hxx cxx}{ statements-base } \ {hxx cxx}{ stream } \ {hxx }{ text } \ - {hxx cxx}{ text-stream } \ + {hxx }{ text-stream } \ {hxx cxx}{ tracer } \ {hxx cxx}{ traits } \ {hxx }{ traits-calls } \ diff --git a/odb/sqlite/makefile b/odb/sqlite/makefile index aa411e7..9f471b0 100644 --- a/odb/sqlite/makefile +++ b/odb/sqlite/makefile @@ -5,7 +5,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make cxx := \ -blob-stream.cxx \ connection.cxx \ connection-factory.cxx \ database.cxx \ @@ -20,7 +19,6 @@ statement.cxx \ statements-base.cxx \ statement-cache.cxx \ stream.cxx \ -text-stream.cxx \ tracer.cxx \ traits.cxx \ transaction.cxx \ diff --git a/odb/sqlite/query.hxx b/odb/sqlite/query.hxx index bb1f50e..199ab27 100644 --- a/odb/sqlite/query.hxx +++ b/odb/sqlite/query.hxx @@ -648,7 +648,7 @@ namespace odb // query_column // - struct LIBODB_SQLITE_EXPORT query_column_base + struct query_column_base { // Note that we keep shallow copies of the table, column, and conversion // expression. The latter can be NULL. diff --git a/odb/sqlite/statement.hxx b/odb/sqlite/statement.hxx index 7344daf..fdc0807 100644 --- a/odb/sqlite/statement.hxx +++ b/odb/sqlite/statement.hxx @@ -297,7 +297,7 @@ namespace odb binding& result_; }; - struct LIBODB_SQLITE_EXPORT auto_result + struct auto_result { explicit auto_result (select_statement& s): s_ (s) {} ~auto_result () {s_.free_result ();} diff --git a/odb/sqlite/text-stream.cxx b/odb/sqlite/text-stream.cxx deleted file mode 100644 index f5642e4..0000000 --- a/odb/sqlite/text-stream.cxx +++ /dev/null @@ -1,7 +0,0 @@ -// file : odb/sqlite/text-stream.cxx -// copyright : Copyright (c) 2005-2015 Code Synthesis Tools CC -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/sqlite/text-stream.hxx> - -// Dummy source file to get Win32 DLL export working. diff --git a/odb/sqlite/text-stream.hxx b/odb/sqlite/text-stream.hxx index 71d3053..4e14d19 100644 --- a/odb/sqlite/text-stream.hxx +++ b/odb/sqlite/text-stream.hxx @@ -9,13 +9,12 @@ #include <odb/sqlite/text.hxx> #include <odb/sqlite/stream.hxx> -#include <odb/sqlite/details/export.hxx> namespace odb { namespace sqlite { - class LIBODB_SQLITE_EXPORT text_stream: public stream + class text_stream: public stream { public: text_stream (const text& b, bool rw) diff --git a/odb/sqlite/text.hxx b/odb/sqlite/text.hxx index 1e7e25f..8ecf81d 100644 --- a/odb/sqlite/text.hxx +++ b/odb/sqlite/text.hxx @@ -25,7 +25,7 @@ namespace odb #pragma db sqlite:type("TEXT STREAM") class text #else - class LIBODB_SQLITE_EXPORT text + class text #endif { public: diff --git a/odb/sqlite/traits.hxx b/odb/sqlite/traits.hxx index dc4d113..0cb82db 100644 --- a/odb/sqlite/traits.hxx +++ b/odb/sqlite/traits.hxx @@ -287,16 +287,10 @@ namespace odb }; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<float, id_real>: - real_value_traits<float> - { - }; + struct default_value_traits<float, id_real>: real_value_traits<float> {}; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<double, id_real>: - real_value_traits<double> - { - }; + struct default_value_traits<double, id_real>: real_value_traits<double> {}; // std::string specialization. // @@ -345,11 +339,10 @@ namespace odb }; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<char*, id_text>: - c_string_value_traits {}; + struct default_value_traits<char*, id_text>: c_string_value_traits {}; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<const char*, id_text>: + struct default_value_traits<const char*, id_text>: c_string_value_traits {}; // char[N] specialization. @@ -430,7 +423,7 @@ namespace odb // char specialization. // template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<char, id_text> + struct default_value_traits<char, id_text> { typedef char value_type; typedef char query_type; @@ -511,14 +504,13 @@ namespace odb struct image_traits<wchar_t*, id_text>: wstring_image_traits {}; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<wchar_t*, id_text>: - c_wstring_value_traits {}; + struct default_value_traits<wchar_t*, id_text>: c_wstring_value_traits {}; template <> struct image_traits<const wchar_t*, id_text>: wstring_image_traits {}; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<const wchar_t*, id_text>: + struct default_value_traits<const wchar_t*, id_text>: c_wstring_value_traits {}; // wchar_t[N] specialization. @@ -609,7 +601,7 @@ namespace odb struct image_traits<wchar_t, id_text>: wstring_image_traits {}; template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<wchar_t, id_text> + struct default_value_traits<wchar_t, id_text> { typedef wchar_t value_type; typedef wchar_t query_type; @@ -856,7 +848,7 @@ namespace odb // text (stream) specialization. // template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<text, id_text_stream> + struct default_value_traits<text, id_text_stream> { public: typedef text value_type; @@ -894,7 +886,7 @@ namespace odb // blob (stream) specialization. // template <> - struct LIBODB_SQLITE_EXPORT default_value_traits<blob, id_blob_stream> + struct default_value_traits<blob, id_blob_stream> { public: typedef blob value_type; |