diff options
Diffstat (limited to 'odb')
51 files changed, 1498 insertions, 49 deletions
diff --git a/odb/Makefile.am b/odb/Makefile.am new file mode 100644 index 0000000..cfb0af8 --- /dev/null +++ b/odb/Makefile.am @@ -0,0 +1,26 @@ +# file : odb/Makefile.am +# author : Boris Kolpackov <boris@codesynthesis.com> +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +lib_LTLIBRARIES = libodb.la +libodb_la_SOURCES = __path__(sources) + +odbincludedir = $(includedir)/odb +nobase_odbinclude_HEADERS = __path__(headers) +nobase_nodist_odbinclude_HEADERS = details/config.h + +EXTRA_DIST = __file__(extra_dist) + +if ODB_THREADS_POSIX +libodb_la_SOURCES += __path__(posix_sources) +nobase_odbinclude_HEADERS += __path__(posix_headers) +endif + +if ODB_THREADS_WIN32 +libodb_la_SOURCES += __path__(win32_sources) +nobase_odbinclude_HEADERS += __path__(win32_headers) +endif + +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +libodb_la_LDFLAGS = -release __value__(interface_version) diff --git a/odb/compilers/vc/pre.hxx b/odb/compilers/vc/pre.hxx index 7f664fd..cdcb527 100644 --- a/odb/compilers/vc/pre.hxx +++ b/odb/compilers/vc/pre.hxx @@ -18,6 +18,7 @@ // #pragma warning (disable:4355) // passing 'this' to a member #pragma warning (disable:4800) // forcing value to bool +#pragma warning (disable:4290) // exception specification ignored //#pragma warning (disable:4275) // non dll-interface base //#pragma warning (disable:4251) // base needs to have dll-interface //#pragma warning (disable:4224) // nonstandard extension (/Za option) diff --git a/odb/core.hxx b/odb/core.hxx index ea0ed05..53aea04 100644 --- a/odb/core.hxx +++ b/odb/core.hxx @@ -6,6 +6,8 @@ #ifndef ODB_CORE_HXX #define ODB_CORE_HXX +#include <odb/pre.hxx> + #ifdef ODB_COMPILER # define ODB_PRAGMA_IMPL(x) _Pragma (#x) # define ODB_PRAGMA(x) ODB_PRAGMA_IMPL (odb x) @@ -15,4 +17,6 @@ #include <odb/forward.hxx> +#include <odb/post.hxx> + #endif // ODB_CORE_HXX diff --git a/odb/database.hxx b/odb/database.hxx index 1f08daf..ca0cc4c 100644 --- a/odb/database.hxx +++ b/odb/database.hxx @@ -6,16 +6,22 @@ #ifndef ODB_DATABASE_HXX #define ODB_DATABASE_HXX +#include <odb/pre.hxx> + +#include <string> + #include <odb/traits.hxx> #include <odb/forward.hxx> #include <odb/query.hxx> #include <odb/result.hxx> +#include <odb/details/export.hxx> + namespace odb { class transaction_impl; - class database + class LIBODB_EXPORT database { public: virtual @@ -100,4 +106,6 @@ namespace odb #include <odb/database.ixx> #include <odb/database.txx> +#include <odb/post.hxx> + #endif // ODB_DATABASE_HXX diff --git a/odb/details/buffer.hxx b/odb/details/buffer.hxx index 4393114..87ee97f 100644 --- a/odb/details/buffer.hxx +++ b/odb/details/buffer.hxx @@ -6,14 +6,18 @@ #ifndef ODB_BUFFER_DETAILS_HXX #define ODB_BUFFER_DETAILS_HXX +#include <odb/pre.hxx> + #include <new> #include <cstddef> // std::size_t +#include <odb/details/export.hxx> + namespace odb { namespace details { - class buffer + class LIBODB_EXPORT buffer { public: ~buffer () @@ -56,4 +60,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_BUFFER_DETAILS_HXX diff --git a/odb/details/condition.hxx b/odb/details/condition.hxx index 9e416d6..127d038 100644 --- a/odb/details/condition.hxx +++ b/odb/details/condition.hxx @@ -6,6 +6,44 @@ #ifndef ODB_DETAILS_CONDITION_HXX #define ODB_DETAILS_CONDITION_HXX +#include <odb/pre.hxx> + +#include <odb/details/config.hxx> +#include <odb/details/export.hxx> + +#ifdef ODB_THREADS_NONE + +namespace odb +{ + namespace details + { + class mutex; + class LIBODB_EXPORT condition + { + public: + condition (mutex&) {} + + void + signal () {} + + void + wait () {} + + private: + condition (const condition&); + condition& operator= (const condition&); + }; + } +} + +#elif defined(ODB_THREADS_POSIX) #include <odb/details/posix/condition.hxx> +#elif defined(ODB_THREADS_WIN32) +#include <odb/details/win32/condition.hxx> +#else +# error unknown threading model +#endif + +#include <odb/post.hxx> #endif // ODB_DETAILS_CONDITION_HXX diff --git a/odb/details/config-vc.h b/odb/details/config-vc.h new file mode 100644 index 0000000..f90ac4d --- /dev/null +++ b/odb/details/config-vc.h @@ -0,0 +1,17 @@ +/* file : odb/details/config-vc.h + * author : Boris Kolpackov <boris@codesynthesis.com> + * copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++. */ + +#ifndef ODB_DETAILS_CONFIG_VC_H +#define ODB_DETAILS_CONFIG_VC_H + +#define ODB_THREADS_WIN32 +#define ODB_THREADS_TLS_DECLSPEC_POINTER +#define ODB_THREADS_TLS_DECLSPEC_OBJECT + + +#endif /* ODB_DETAILS_CONFIG_VC_H */ diff --git a/odb/details/config.h.in b/odb/details/config.h.in new file mode 100644 index 0000000..aa2417d --- /dev/null +++ b/odb/details/config.h.in @@ -0,0 +1,16 @@ +/* file : odb/details/config.h.in + * author : Boris Kolpackov <boris@codesynthesis.com> + * copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_DETAILS_CONFIG_H +#define ODB_DETAILS_CONFIG_H + +#undef ODB_THREADS_NONE +#undef ODB_THREADS_POSIX +#undef ODB_THREADS_WIN32 + +#endif /* ODB_DETAILS_CONFIG_H */ diff --git a/odb/details/config.hxx b/odb/details/config.hxx new file mode 100644 index 0000000..c5b97df --- /dev/null +++ b/odb/details/config.hxx @@ -0,0 +1,23 @@ +// file : odb/details/config.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_CONFIG_HXX +#define ODB_DETAILS_CONFIG_HXX + +// no pre + +#ifdef _MSC_VER +# include <odb/details/config-vc.h> +#else +# ifdef HAVE_CONFIG_H +# include <odb/details/config.h> +# else +# define ODB_THREADS_POSIX +# endif +#endif + +// no post + +#endif // ODB_DETAILS_CONFIG_HXX diff --git a/odb/details/exception.hxx b/odb/details/exception.hxx index 2da18ac..cebb8ca 100644 --- a/odb/details/exception.hxx +++ b/odb/details/exception.hxx @@ -6,16 +6,22 @@ #ifndef ODB_DETAILS_EXCEPTION_HXX #define ODB_DETAILS_EXCEPTION_HXX +#include <odb/pre.hxx> + #include <odb/exception.hxx> +#include <odb/details/export.hxx> + namespace odb { namespace details { - struct exception: odb::exception + struct LIBODB_EXPORT exception: odb::exception { }; } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_EXCEPTION_HXX diff --git a/odb/details/export.hxx b/odb/details/export.hxx new file mode 100644 index 0000000..ef43c6c --- /dev/null +++ b/odb/details/export.hxx @@ -0,0 +1,29 @@ +// file : odb/details/export.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_EXPORT_HXX +#define ODB_DETAILS_EXPORT_HXX + +#include <odb/pre.hxx> + +#include <odb/details/config.hxx> + +#ifdef LIBODB_STATIC_LIB +# define LIBODB_EXPORT +#else +# ifdef _WIN32 +# ifdef LIBODB_DYNAMIC_LIB +# define LIBODB_EXPORT __declspec(dllexport) +# else +# define LIBODB_EXPORT __declspec(dllimport) +# endif +# else +# define LIBODB_EXPORT +# endif +#endif + +#include <odb/post.hxx> + +#endif // ODB_DETAILS_EXPORT_HXX diff --git a/odb/details/lock.hxx b/odb/details/lock.hxx index 0ee5a6d..044dfdb 100644 --- a/odb/details/lock.hxx +++ b/odb/details/lock.hxx @@ -6,13 +6,16 @@ #ifndef ODB_DETAILS_LOCK_HXX #define ODB_DETAILS_LOCK_HXX +#include <odb/pre.hxx> + +#include <odb/details/export.hxx> #include <odb/details/posix/mutex.hxx> namespace odb { namespace details { - struct lock + struct LIBODB_EXPORT lock { lock (mutex& m) : mutex_ (m), locked_ (true) @@ -43,4 +46,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_LOCK_HXX diff --git a/odb/details/meta/answer.hxx b/odb/details/meta/answer.hxx index 31387a9..f607c71 100644 --- a/odb/details/meta/answer.hxx +++ b/odb/details/meta/answer.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_ANSWER_HXX #define ODB_DETAILS_META_ANSWER_HXX +#include <odb/pre.hxx> + namespace odb { namespace details @@ -25,4 +27,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_ANSWER_HXX diff --git a/odb/details/meta/class-p.hxx b/odb/details/meta/class-p.hxx index c680d8e..dcbdda2 100644 --- a/odb/details/meta/class-p.hxx +++ b/odb/details/meta/class-p.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_CLASS_HXX #define ODB_DETAILS_META_CLASS_HXX +#include <odb/pre.hxx> + #include <odb/details/meta/answer.hxx> namespace odb @@ -28,4 +30,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_CLASS_HXX diff --git a/odb/details/meta/polymorphic-p.hxx b/odb/details/meta/polymorphic-p.hxx index 6e95144..f6f122f 100644 --- a/odb/details/meta/polymorphic-p.hxx +++ b/odb/details/meta/polymorphic-p.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_POLYMORPHIC_HXX #define ODB_DETAILS_META_POLYMORPHIC_HXX +#include <odb/pre.hxx> + #include <odb/details/meta/class-p.hxx> #include <odb/details/meta/remove-cv.hxx> @@ -51,4 +53,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_POLYMORPHIC_HXX diff --git a/odb/details/meta/remove-c.hxx b/odb/details/meta/remove-c.hxx index 9d8e0b5..6326e2a 100644 --- a/odb/details/meta/remove-c.hxx +++ b/odb/details/meta/remove-c.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_C_HXX #define ODB_DETAILS_META_REMOVE_C_HXX +#include <odb/pre.hxx> + namespace odb { namespace details @@ -27,4 +29,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_REMOVE_C_HXX diff --git a/odb/details/meta/remove-cv.hxx b/odb/details/meta/remove-cv.hxx index 958fc08..f5982e1 100644 --- a/odb/details/meta/remove-cv.hxx +++ b/odb/details/meta/remove-cv.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_CV_HXX #define ODB_DETAILS_META_REMOVE_CV_HXX +#include <odb/pre.hxx> + #include <odb/details/meta/remove-c.hxx> #include <odb/details/meta/remove-v.hxx> @@ -24,4 +26,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_REMOVE_CV_HXX diff --git a/odb/details/meta/remove-p.hxx b/odb/details/meta/remove-p.hxx index c8f6d92..b017399 100644 --- a/odb/details/meta/remove-p.hxx +++ b/odb/details/meta/remove-p.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_P_HXX #define ODB_DETAILS_META_REMOVE_P_HXX +#include <odb/pre.hxx> + namespace odb { namespace details @@ -27,4 +29,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_REMOVE_P_HXX diff --git a/odb/details/meta/remove-v.hxx b/odb/details/meta/remove-v.hxx index c91b7e4..d77e9d2 100644 --- a/odb/details/meta/remove-v.hxx +++ b/odb/details/meta/remove-v.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_V_HXX #define ODB_DETAILS_META_REMOVE_V_HXX +#include <odb/pre.hxx> + namespace odb { namespace details @@ -27,4 +29,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_META_REMOVE_V_HXX diff --git a/odb/details/mutex.hxx b/odb/details/mutex.hxx index e1121b9..b0d59bb 100644 --- a/odb/details/mutex.hxx +++ b/odb/details/mutex.hxx @@ -6,6 +6,43 @@ #ifndef ODB_DETAILS_MUTEX_HXX #define ODB_DETAILS_MUTEX_HXX +#include <odb/pre.hxx> + +#include <odb/details/config.hxx> +#include <odb/details/export.hxx> + +#ifdef ODB_THREADS_NONE + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT mutex + { + public: + mutex () {} + + void + lock () {} + + void + unlock () {} + + private: + mutex (const mutex&); + mutex& operator= (const mutex&); + }; + } +} + +#elif defined(ODB_THREADS_POSIX) #include <odb/details/posix/mutex.hxx> +#elif defined(ODB_THREADS_WIN32) +#include <odb/details/win32/mutex.hxx> +#else +# error unknown threading model +#endif + +#include <odb/post.hxx> #endif // ODB_DETAILS_MUTEX_HXX diff --git a/odb/details/posix/condition.hxx b/odb/details/posix/condition.hxx index 8e8e05c..1358db8 100644 --- a/odb/details/posix/condition.hxx +++ b/odb/details/posix/condition.hxx @@ -6,15 +6,18 @@ #ifndef ODB_DETAILS_POSIX_CONDITION_HXX #define ODB_DETAILS_POSIX_CONDITION_HXX +#include <odb/pre.hxx> + #include <pthread.h> +#include <odb/details/export.hxx> #include <odb/details/posix/mutex.hxx> namespace odb { namespace details { - class condition + class LIBODB_EXPORT condition { public: ~condition (); @@ -39,4 +42,6 @@ namespace odb #include <odb/details/posix/condition.ixx> +#include <odb/post.hxx> + #endif // ODB_DETAILS_POSIX_CONDITION_HXX diff --git a/odb/details/posix/exceptions.hxx b/odb/details/posix/exceptions.hxx index f4b4572..76f5763 100644 --- a/odb/details/posix/exceptions.hxx +++ b/odb/details/posix/exceptions.hxx @@ -6,13 +6,16 @@ #ifndef ODB_DETAILS_POSIX_EXCEPTIONS_HXX #define ODB_DETAILS_POSIX_EXCEPTIONS_HXX +#include <odb/pre.hxx> + +#include <odb/details/export.hxx> #include <odb/details/exception.hxx> namespace odb { namespace details { - struct posix_exception: details::exception + struct LIBODB_EXPORT posix_exception: details::exception { posix_exception (int code) : code_ (code) {} @@ -28,4 +31,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_POSIX_EXCEPTIONS_HXX diff --git a/odb/details/posix/mutex.hxx b/odb/details/posix/mutex.hxx index d06a8c3..d62fa24 100644 --- a/odb/details/posix/mutex.hxx +++ b/odb/details/posix/mutex.hxx @@ -6,13 +6,17 @@ #ifndef ODB_DETAILS_POSIX_MUTEX_HXX #define ODB_DETAILS_POSIX_MUTEX_HXX +#include <odb/pre.hxx> + #include <pthread.h> +#include <odb/details/export.hxx> + namespace odb { namespace details { - class mutex + class LIBODB_EXPORT mutex { public: ~mutex (); @@ -37,4 +41,6 @@ namespace odb #include <odb/details/posix/mutex.ixx> +#include <odb/post.hxx> + #endif // ODB_DETAILS_POSIX_MUTEX_HXX diff --git a/odb/details/posix/thread.hxx b/odb/details/posix/thread.hxx index 5036b37..f2e2a75 100644 --- a/odb/details/posix/thread.hxx +++ b/odb/details/posix/thread.hxx @@ -6,13 +6,17 @@ #ifndef ODB_DETAILS_POSIX_THREAD_HXX #define ODB_DETAILS_POSIX_THREAD_HXX +#include <odb/pre.hxx> + #include <pthread.h> +#include <odb/details/export.hxx> + namespace odb { namespace details { - class thread + class LIBODB_EXPORT thread { public: ~thread (); @@ -34,4 +38,6 @@ namespace odb #include <odb/details/posix/thread.ixx> +#include <odb/post.hxx> + #endif // ODB_DETAILS_POSIX_THREAD_HXX diff --git a/odb/details/posix/tls.hxx b/odb/details/posix/tls.hxx index 6e11a64..92b0f4b 100644 --- a/odb/details/posix/tls.hxx +++ b/odb/details/posix/tls.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_POSIX_TLS_HXX #define ODB_DETAILS_POSIX_TLS_HXX +#include <odb/pre.hxx> + #include <pthread.h> namespace odb @@ -69,23 +71,23 @@ namespace odb template <typename T> inline T& - tls_get (const tls<T>& s) + tls_get (const tls<T>& t) { - return s.get (); + return t.get (); } template <typename T> inline T* - tls_get (const tls<T*>& s) + tls_get (const tls<T*>& t) { - return s.get (); + return t.get (); } template <typename T> inline void - tls_set (tls<T*>& s, T* p) + tls_set (tls<T*>& t, T* p) { - return s.set (p); + t.set (p); } } } @@ -93,4 +95,6 @@ namespace odb #include <odb/details/posix/tls.ixx> #include <odb/details/posix/tls.txx> +#include <odb/post.hxx> + #endif // ODB_DETAILS_POSIX_TLS_HXX diff --git a/odb/details/shared-ptr.hxx b/odb/details/shared-ptr.hxx index 6a9a640..dfa620c 100644 --- a/odb/details/shared-ptr.hxx +++ b/odb/details/shared-ptr.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_SHARED_PTR_HXX #define ODB_DETAILS_SHARED_PTR_HXX +#include <odb/pre.hxx> + #include <odb/details/shared-ptr/base.hxx> namespace odb @@ -159,4 +161,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_DETAILS_SHARED_PTR_HXX diff --git a/odb/details/shared-ptr/base.hxx b/odb/details/shared-ptr/base.hxx index 4fbbc0b..309f7d2 100644 --- a/odb/details/shared-ptr/base.hxx +++ b/odb/details/shared-ptr/base.hxx @@ -6,16 +6,20 @@ #ifndef ODB_DETAILS_SHARED_PTR_BASE_HXX #define ODB_DETAILS_SHARED_PTR_BASE_HXX +#include <odb/pre.hxx> + #include <new> #include <cstddef> // std::size_t #include <odb/exception.hxx> +#include <odb/details/export.hxx> + namespace odb { namespace details { - struct share + struct LIBODB_EXPORT share { explicit share (char id); @@ -32,23 +36,23 @@ namespace odb } } -void* +LIBODB_EXPORT void* operator new (std::size_t, odb::details::share) throw (std::bad_alloc); -void +LIBODB_EXPORT void operator delete (void*, odb::details::share) throw (); namespace odb { namespace details { - struct not_shared: exception + struct LIBODB_EXPORT not_shared: exception { virtual const char* what () const throw (); }; - struct shared_base + struct LIBODB_EXPORT shared_base { shared_base (); shared_base (const shared_base&); @@ -105,4 +109,6 @@ namespace odb #include <odb/details/shared-ptr/base.ixx> #include <odb/details/shared-ptr/base.txx> +#include <odb/post.hxx> + #endif // ODB_DETAILS_SHARED_PTR_BASE_HXX diff --git a/odb/details/thread.hxx b/odb/details/thread.hxx index 4dba45e..f3da490 100644 --- a/odb/details/thread.hxx +++ b/odb/details/thread.hxx @@ -6,6 +6,20 @@ #ifndef ODB_DETAILS_THREAD_HXX #define ODB_DETAILS_THREAD_HXX +#include <odb/pre.hxx> + +#include <odb/details/config.hxx> + +#ifdef ODB_THREADS_NONE +# error no thread support available +#elif defined(ODB_THREADS_POSIX) #include <odb/details/posix/thread.hxx> +#elif defined(ODB_THREADS_WIN32) +#include <odb/details/win32/thread.hxx> +#else +# error unknown threading model +#endif + +#include <odb/post.hxx> #endif // ODB_DETAILS_THREAD_HXX diff --git a/odb/details/tls.hxx b/odb/details/tls.hxx index 6d38e6b..7ce5c19 100644 --- a/odb/details/tls.hxx +++ b/odb/details/tls.hxx @@ -6,9 +6,101 @@ #ifndef ODB_DETAILS_TLS_HXX #define ODB_DETAILS_TLS_HXX -#include <odb/details/posix/tls.hxx> +#include <odb/pre.hxx> -#define ODB_TLS_POINTER(type) tls<type*> -#define ODB_TLS_OBJECT(type) tls<type> +#include <odb/details/config.hxx> + +#ifdef ODB_THREADS_NONE + +# define ODB_TLS_POINTER(type) type* +# define ODB_TLS_OBJECT(type) type + +namespace odb +{ + namespace details + { + template <typename T> + inline T& + tls_get (T& x) + { + return x; + } + + template <typename T> + inline T* + tls_get (T* p) + { + return p; + } + + template <typename T> + inline void + tls_set (T*& rp, T* p) + { + rp = p; + } + } +} + +#elif defined(ODB_THREADS_POSIX) + +# include <odb/details/posix/tls.hxx> +# define ODB_TLS_POINTER(type) tls<type*> +# define ODB_TLS_OBJECT(type) tls<type> + +#elif defined(ODB_THREADS_WIN32) + +# ifdef ODB_THREADS_TLS_DECLSPEC_POINTER +# define ODB_TLS_POINTER(type) __declspec(thread) type* + +namespace odb +{ + namespace details + { + template <typename T> + inline T* + tls_get (T* p) + { + return p; + } + + template <typename T> + inline void + tls_set (T*& rp, T* p) + { + rp = p; + } + } +} + +# else +# error unsupported TLS pointer model +# endif + +# ifdef ODB_THREADS_TLS_DECLSPEC_OBJECT +# define ODB_TLS_OBJECT(type) __declspec(thread) type + +namespace odb +{ + namespace details + { + template <typename T> + inline T& + tls_get (T& x) + { + return x; + } + } +} + +# else +# error unsupported TLS object model +# endif + +#else +# error unknown threading model +#endif + +#include <odb/post.hxx> #endif // ODB_DETAILS_TLS_HXX diff --git a/odb/details/win32/condition.cxx b/odb/details/win32/condition.cxx new file mode 100644 index 0000000..93c396b --- /dev/null +++ b/odb/details/win32/condition.cxx @@ -0,0 +1,57 @@ +// file : odb/details/win32/condition.cxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <windows.h> + +#include <odb/details/win32/condition.hxx> +#include <odb/details/win32/exceptions.hxx> + +namespace odb +{ + namespace details + { + void condition:: + signal () + { + mutex_.lock (); + + if (waiters_ > signals_) + { + if (signals_++ == 0) + { + if (SetEvent (event_) == 0) + throw win32_exception (); + } + } + + mutex_.unlock (); + } + + void condition:: + wait () + { + // When we enter this functions the mutex is locked. When we + // return from this function the mutex must be locked. + // + waiters_++; + mutex_.unlock (); + + if (WaitForSingleObject (event_, INFINITE) != 0) + throw win32_exception (); + + mutex_.lock (); + waiters_--; + signals_--; + + if (signals_ > 0) + { + // Wake up the next thread. + // + if (SetEvent (event_) == 0) + throw win32_exception (); + } + } + } +} diff --git a/odb/details/win32/condition.hxx b/odb/details/win32/condition.hxx new file mode 100644 index 0000000..3c40f3a --- /dev/null +++ b/odb/details/win32/condition.hxx @@ -0,0 +1,52 @@ +// file : odb/details/win32/condition.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_CONDITION_HXX +#define ODB_DETAILS_WIN32_CONDITION_HXX + +#include <odb/pre.hxx> + +#include <windows.h> + +#include <cstddef> // std::size_t + +#include <odb/details/export.hxx> +#include <odb/details/win32/mutex.hxx> + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT condition + { + public: + ~condition (); + condition (mutex&); + + void + signal (); + + void + wait (); + + private: + condition (const condition&); + condition& operator= (const condition&); + + private: + mutex& mutex_; + HANDLE event_; + + std::size_t waiters_; + std::size_t signals_; + }; + } +} + +#include <odb/details/win32/condition.ixx> + +#include <odb/post.hxx> + +#endif // ODB_DETAILS_WIN32_CONDITION_HXX diff --git a/odb/details/win32/condition.ixx b/odb/details/win32/condition.ixx new file mode 100644 index 0000000..4a6bd1d --- /dev/null +++ b/odb/details/win32/condition.ixx @@ -0,0 +1,32 @@ +// file : odb/details/win32/condition.ixx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <odb/details/win32/exceptions.hxx> + +namespace odb +{ + namespace details + { + inline condition:: + ~condition () + { + CloseHandle (event_); + } + + inline condition:: + condition (mutex& mutex) + : mutex_ (mutex), waiters_ (0), signals_ (0) + { + // Auto-reset event. Releases one waiting thread and automatically + // resets the event state. If no threads are waiting the event + // remains signalled. + // + event_ = CreateEvent (0, false, false, 0); + + if (event_ == 0) + throw win32_exception (); + } + } +} diff --git a/odb/details/win32/exceptions.cxx b/odb/details/win32/exceptions.cxx new file mode 100644 index 0000000..e8652cd --- /dev/null +++ b/odb/details/win32/exceptions.cxx @@ -0,0 +1,18 @@ +// file : odb/details/win32/exceptions.cxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <odb/details/win32/exceptions.hxx> + +namespace odb +{ + namespace details + { + const char* win32_exception:: + what () const throw () + { + return "Win32 API error"; + } + } +} diff --git a/odb/details/win32/exceptions.hxx b/odb/details/win32/exceptions.hxx new file mode 100644 index 0000000..b9ccf50 --- /dev/null +++ b/odb/details/win32/exceptions.hxx @@ -0,0 +1,39 @@ +// file : odb/details/win32/exceptions.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_EXCEPTIONS_HXX +#define ODB_DETAILS_WIN32_EXCEPTIONS_HXX + +#include <odb/pre.hxx> + +#include <windows.h> + +#include <odb/details/export.hxx> +#include <odb/details/exception.hxx> + +namespace odb +{ + namespace details + { + struct LIBODB_EXPORT win32_exception: details::exception + { + win32_exception () : code_ (GetLastError ()) {} + win32_exception (DWORD code) : code_ (code) {} + + DWORD + code () const {return code_;} + + virtual const char* + what () const throw (); + + private: + DWORD code_; + }; + } +} + +#include <odb/post.hxx> + +#endif // ODB_DETAILS_WIN32_EXCEPTIONS_HXX diff --git a/odb/details/win32/mutex.hxx b/odb/details/win32/mutex.hxx new file mode 100644 index 0000000..9dbe3a8 --- /dev/null +++ b/odb/details/win32/mutex.hxx @@ -0,0 +1,46 @@ +// file : odb/details/win32/mutex.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_MUTEX_HXX +#define ODB_DETAILS_WIN32_MUTEX_HXX + +#include <odb/pre.hxx> + +#include <windows.h> + +#include <odb/details/export.hxx> + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT mutex + { + public: + ~mutex (); + mutex (); + + void + lock (); + + void + unlock (); + + private: + mutex (const mutex&); + mutex& operator= (const mutex&); + + private: + friend class condition; + CRITICAL_SECTION cs_; + }; + } +} + +#include <odb/details/win32/mutex.ixx> + +#include <odb/post.hxx> + +#endif // ODB_DETAILS_WIN32_MUTEX_HXX diff --git a/odb/details/win32/mutex.ixx b/odb/details/win32/mutex.ixx new file mode 100644 index 0000000..a2b6d37 --- /dev/null +++ b/odb/details/win32/mutex.ixx @@ -0,0 +1,34 @@ +// file : odb/details/win32/mutex.ixx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +namespace odb +{ + namespace details + { + inline mutex:: + ~mutex () + { + DeleteCriticalSection (&cs_); + } + + inline mutex:: + mutex () + { + InitializeCriticalSection (&cs_); + } + + inline void mutex:: + lock () + { + EnterCriticalSection (&cs_); + } + + inline void mutex:: + unlock () + { + LeaveCriticalSection (&cs_); + } + } +} diff --git a/odb/details/win32/thread.cxx b/odb/details/win32/thread.cxx new file mode 100644 index 0000000..610980d --- /dev/null +++ b/odb/details/win32/thread.cxx @@ -0,0 +1,91 @@ +// file : odb/details/win32/thread.cxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <windows.h> +#include <process.h> // _beginthreadex, _endthreadex + +#include <memory> // std::auto_ptr + +#include <odb/details/win32/thread.hxx> +#include <odb/details/win32/exceptions.hxx> + +unsigned int __stdcall +odb_thread_thunk (void* arg) +{ + odb::details::thread::thread_thunk (arg); + _endthreadex (0); + return 0; +} + +namespace odb +{ + namespace details + { + void thread:: + thread_thunk (void* arg) + { + data* d (static_cast<data*> (arg)); + d->ret = d->func (d->arg); + d->mutex.lock (); + unsigned char count = --d->count; + d->mutex.unlock (); + + if (count == 0) + delete d; + } + + thread:: + ~thread () + { + if (handle_ != 0) + { + CloseHandle (handle_); + + // Win32 mutex implementation does not throw. + // + data_->mutex.lock (); + unsigned char count = --data_->count; + data_->mutex.unlock (); + + if (count == 0) + delete data_; + } + } + + thread:: + thread (void* (*func) (void*), void* arg) + { + std::auto_ptr<data> d (new data); + d->func = func; + d->arg = arg; + d->count = 2; // One for the thread and one for us. + + handle_ = (HANDLE)_beginthreadex ( + 0, 0, &odb_thread_thunk, d.get (), 0, 0); + + if (handle_ == 0) + throw win32_exception (); + + data_ = d.release (); + } + + void* thread:: + join () + { + void* r; + + if (WaitForSingleObject (handle_, INFINITE) != 0) + throw win32_exception (); + + r = data_->ret; + + CloseHandle (handle_); + delete data_; + handle_ = 0; + data_ = 0; + return r; + } + } +} diff --git a/odb/details/win32/thread.hxx b/odb/details/win32/thread.hxx new file mode 100644 index 0000000..d52de48 --- /dev/null +++ b/odb/details/win32/thread.hxx @@ -0,0 +1,62 @@ +// file : odb/details/win32/thread.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_THREAD_HXX +#define ODB_DETAILS_WIN32_THREAD_HXX + +#include <odb/pre.hxx> + +#include <windows.h> + +#include <odb/details/export.hxx> +#include <odb/details/win32/mutex.hxx> + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT thread + { + public: + ~thread (); + thread (void* (*thread_func) (void*), void* arg = 0); + + void* + join (); + + private: + thread (const thread&); + thread& operator= (const thread&); + + private: + typedef void* (*thread_func) (void*); + + struct data + { + thread_func func; + void* arg; + void* ret; + + // Thread-safe reference counter. + // + details::mutex mutex; + unsigned char count; + }; + + + public: + static void + thread_thunk (void*); + + private: + HANDLE handle_; + data* data_; + }; + } +} + +#include <odb/post.hxx> + +#endif // ODB_DETAILS_WIN32_THREAD_HXX diff --git a/odb/exception.hxx b/odb/exception.hxx index c8e2f35..0ab188a 100644 --- a/odb/exception.hxx +++ b/odb/exception.hxx @@ -6,11 +6,15 @@ #ifndef ODB_EXCEPTION_HXX #define ODB_EXCEPTION_HXX +#include <odb/pre.hxx> + #include <exception> +#include <odb/details/export.hxx> + namespace odb { - struct exception: std::exception + struct LIBODB_EXPORT exception: std::exception { // By default return the exception type name ( typeid (*this).name () ). // @@ -19,4 +23,6 @@ namespace odb }; } +#include <odb/post.hxx> + #endif // ODB_EXCEPTION_HXX diff --git a/odb/exceptions.hxx b/odb/exceptions.hxx index 13603be..ff97873 100644 --- a/odb/exceptions.hxx +++ b/odb/exceptions.hxx @@ -6,37 +6,43 @@ #ifndef ODB_EXCEPTIONS_HXX #define ODB_EXCEPTIONS_HXX +#include <odb/pre.hxx> + #include <odb/exception.hxx> +#include <odb/details/export.hxx> + namespace odb { - struct already_in_transaction: odb::exception + struct LIBODB_EXPORT already_in_transaction: odb::exception { }; - struct not_in_transaction: odb::exception + struct LIBODB_EXPORT not_in_transaction: odb::exception { }; - struct transaction_already_finilized: odb::exception + struct LIBODB_EXPORT transaction_already_finilized: odb::exception { }; - struct deadlock: odb::exception + struct LIBODB_EXPORT deadlock: odb::exception { }; - struct object_not_persistent: odb::exception + struct LIBODB_EXPORT object_not_persistent: odb::exception { }; - struct object_already_persistent: odb::exception + struct LIBODB_EXPORT object_already_persistent: odb::exception { }; - struct database_exception: odb::exception + struct LIBODB_EXPORT database_exception: odb::exception { }; } +#include <odb/post.hxx> + #endif // ODB_EXCEPTIONS_HXX diff --git a/odb/forward.hxx b/odb/forward.hxx index 695cef6..38b1415 100644 --- a/odb/forward.hxx +++ b/odb/forward.hxx @@ -6,6 +6,8 @@ #ifndef ODB_FORWARD_HXX #define ODB_FORWARD_HXX +#include <odb/pre.hxx> + namespace odb { class database; @@ -31,4 +33,6 @@ namespace odb }; } +#include <odb/post.hxx> + #endif // ODB_FORWARD_HXX diff --git a/odb/libodb-vc10.vcxproj b/odb/libodb-vc10.vcxproj new file mode 100644 index 0000000..5047a56 --- /dev/null +++ b/odb/libodb-vc10.vcxproj @@ -0,0 +1,172 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libodb</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>..\bin\</OutDir> + <TargetName>odb_d-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>..\bin64\</OutDir> + <TargetName>odb_d-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>..\bin\</OutDir> + <TargetName>odb-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>..\bin64\</OutDir> + <TargetName>odb-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\lib\odb_d.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\lib64\odb_d.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\lib\odb.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\lib64\odb.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemGroup> +__header_entries__(headers) +__header_entry__(details\config-vc.h) + </ItemGroup> + <ItemGroup> +__source_entries__(sources) +__source_entries__(win32_sources) + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/odb/libodb-vc10.vcxproj.filters b/odb/libodb-vc10.vcxproj.filters new file mode 100644 index 0000000..1663f9d --- /dev/null +++ b/odb/libodb-vc10.vcxproj.filters @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cxx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hxx;ixx;txx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> +__header_filter_entries__(headers) +__header_filter_entry__(details\config-vc.h) + </ItemGroup> + <ItemGroup> +__source_filter_entries__(sources) +__source_filter_entries__(win32_sources) + </ItemGroup> +</Project> diff --git a/odb/libodb-vc9.vcproj b/odb/libodb-vc9.vcproj new file mode 100644 index 0000000..ac970db --- /dev/null +++ b/odb/libodb-vc9.vcproj @@ -0,0 +1,357 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libodb" + ProjectGUID="{513E5721-D318-46B0-8CFB-054042DF87A7}" + RootNamespace="libodb" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".." + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="0" + AdditionalIncludeDirectories=".." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\lib mkdir ..\lib" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\bin\odb_d-__value__(interface_version)-vc9.dll" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)\lib\odb_d.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory=".." + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="0" + AdditionalIncludeDirectories=".." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\lib64 mkdir ..\lib64" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\bin64\odb_d-__value__(interface_version)-vc9.dll" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)\lib64\odb_d.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".." + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=".." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\lib mkdir ..\lib" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\bin\odb-__value__(interface_version)-vc9.dll" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)\lib\odb.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory=".." + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=".." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\lib64 mkdir ..\lib64" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\bin64\odb-__value__(interface_version)-vc9.dll" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)\lib64\odb.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cxx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > +__source_entries__(sources) +__source_entries__(win32_sources) + </Filter> + <Filter + Name="Header Files" + Filter="h;hxx;ixx;txx" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > +__file_entries__(headers) +__file_entry__(details\config-vc.h) + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/odb/makefile b/odb/makefile index 9b6c094..e058463 100644 --- a/odb/makefile +++ b/odb/makefile @@ -5,27 +5,41 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make -cxx_tun := \ -exception.cxx \ -exceptions.cxx \ -database.cxx \ +cxx := \ +exception.cxx \ +exceptions.cxx \ +database.cxx \ transaction.cxx -cxx_tun += details/buffer.cxx details/shared-ptr/base.cxx +# Implementation details. +# +cxx += \ +details/buffer.cxx \ +details/shared-ptr/base.cxx # POSIX-based implementation details. # -cxx_tun += details/posix/exceptions.cxx details/posix/thread.cxx +posix_cxx := \ +details/posix/exceptions.cxx \ +details/posix/thread.cxx + +# Win32-based implementation details. +# +win32_cxx := \ +details/win32/exceptions.cxx \ +details/win32/condition.cxx \ +details/win32/thread.cxx -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) +cxx_tun := $(cxx) $(posix_cxx) +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) +cxx_od := $(cxx_obj:.o=.o.d) odb.l := $(out_base)/odb.l odb.l.cpp-options := $(out_base)/odb.l.cpp-options -default := $(out_base)/ -install := $(out_base)/.install -clean := $(out_base)/.clean +default := $(out_base)/ +dist := $(out_base)/.dist +clean := $(out_base)/.clean # Build. @@ -33,7 +47,7 @@ clean := $(out_base)/.clean $(odb.l): $(cxx_obj) -lpthread $(cxx_obj) $(cxx_od): $(odb.l.cpp-options) -$(odb.l.cpp-options): value := -I$(src_root) +$(odb.l.cpp-options): value := -I$(out_root) -I$(src_root) $(call include-dep,$(cxx_od)) @@ -42,12 +56,33 @@ $(call include-dep,$(cxx_od)) # $(out_base)/: $(odb.l) -# Install. +# Dist. # -$(install): $(odb.l) - $(call install-lib,$<,$(install_lib_dir)/$(ld_lib_prefix)odb$(ld_lib_suffix)) - $(call install-dir,$(src_base),$(install_inc_dir)/odb,\ -'(' -name '*.hxx' -o -name '*.ixx' -o -name '*.txx' ')') +$(dist): export sources := $(cxx) +$(dist): export posix_sources := $(posix_cxx) +$(dist): export win32_sources := $(win32_cxx) + +$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ +-path $(src_base)/details/posix -a -prune -a -false -o \ +-path $(src_base)/details/win32 -a -prune -a -false -o \ +-name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): export posix_headers = $(subst $(src_base)/,,$(shell find \ +$(src_base)/details/posix -name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): export win32_headers = $(subst $(src_base)/,,$(shell find \ +$(src_base)/details/win32 -name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) + +$(dist): data_dist := details/config-vc.h +$(dist): export extra_dist := $(data_dist) libodb-vc9.vcproj \ +libodb-vc10.vcxproj libodb-vc10.vcxproj.filters +$(dist): export interface_version = $(shell sed -e \ +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) + +$(dist): + $(call dist-data,$(sources) $(posix_sources) $(win32_sources) \ +$(headers) $(posix_headers) $(win32_headers) $(data_dist) details/config.h.in) + $(call meta-vc9proj,$(src_base)/libodb-vc9.vcproj) + $(call meta-vc10proj,$(src_base)/libodb-vc10.vcxproj) + $(call meta-automake) # Clean. # @@ -59,6 +94,11 @@ $(clean): $(odb.l).o.clean \ # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/vc9proj.make) +$(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(bld_root)/cxx/o-l.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/odb/pointer-traits.hxx b/odb/pointer-traits.hxx index 23ec1f8..18162e4 100644 --- a/odb/pointer-traits.hxx +++ b/odb/pointer-traits.hxx @@ -6,6 +6,8 @@ #ifndef ODB_POINTER_TRAITS_HXX #define ODB_POINTER_TRAITS_HXX +#include <odb/pre.hxx> + #include <new> // operators new/delete #include <cstddef> // std::size_t @@ -157,4 +159,6 @@ namespace odb }; } +#include <odb/post.hxx> + #endif // ODB_POINTER_TRAITS_HXX diff --git a/odb/query.hxx b/odb/query.hxx index 56af84b..6c2de0d 100644 --- a/odb/query.hxx +++ b/odb/query.hxx @@ -6,6 +6,8 @@ #ifndef ODB_QUERY_HXX #define ODB_QUERY_HXX +#include <odb/pre.hxx> + #include <odb/traits.hxx> namespace odb @@ -15,4 +17,6 @@ namespace odb class query; } +#include <odb/post.hxx> + #endif // ODB_QUERY_HXX diff --git a/odb/result.hxx b/odb/result.hxx index 58dd9cb..7501326 100644 --- a/odb/result.hxx +++ b/odb/result.hxx @@ -6,6 +6,8 @@ #ifndef ODB_RESULT_HXX #define ODB_RESULT_HXX +#include <odb/pre.hxx> + #include <cstddef> // std::ptrdiff_t, std::size_t #include <iterator> // iterator categories @@ -234,4 +236,6 @@ namespace odb #include <odb/result.txx> +#include <odb/post.hxx> + #endif // ODB_RESULT_HXX diff --git a/odb/traits.hxx b/odb/traits.hxx index 5e500bf..bfdcf71 100644 --- a/odb/traits.hxx +++ b/odb/traits.hxx @@ -6,6 +6,8 @@ #ifndef ODB_TRAITS_HXX #define ODB_TRAITS_HXX +#include <odb/pre.hxx> + #include <odb/forward.hxx> #include <odb/pointer-traits.hxx> @@ -83,4 +85,6 @@ namespace odb }; } +#include <odb/post.hxx> + #endif // ODB_TRAITS_HXX diff --git a/odb/transaction.hxx b/odb/transaction.hxx index 43526d0..71d17eb 100644 --- a/odb/transaction.hxx +++ b/odb/transaction.hxx @@ -6,13 +6,17 @@ #ifndef ODB_TRANSACTION_HXX #define ODB_TRANSACTION_HXX +#include <odb/pre.hxx> + #include <odb/forward.hxx> +#include <odb/details/export.hxx> + namespace odb { class transaction_impl; - class transaction + class LIBODB_EXPORT transaction { public: typedef odb::database database_type; @@ -62,7 +66,7 @@ namespace odb transaction_impl* impl_; }; - class transaction_impl + class LIBODB_EXPORT transaction_impl { protected: friend class transaction; @@ -96,4 +100,6 @@ namespace odb #include <odb/transaction.ixx> +#include <odb/post.hxx> + #endif // ODB_TRANSACTION_HXX diff --git a/odb/version.hxx b/odb/version.hxx index 7bc1928..e0f9833 100644 --- a/odb/version.hxx +++ b/odb/version.hxx @@ -6,6 +6,8 @@ #ifndef ODB_VERSION_HXX #define ODB_VERSION_HXX +#include <odb/pre.hxx> + // Version format is AABBCCDD where // // AA - major version number @@ -33,4 +35,6 @@ #define LIBODB_VERSION 999901 #define LIBODB_VERSION_STR "1.0.0.a1" +#include <odb/post.hxx> + #endif // ODB_VERSION_HXX |