diff options
Diffstat (limited to 'libodb-mssql/odb/mssql/details')
-rw-r--r-- | libodb-mssql/odb/mssql/details/build2/config-stub.h | 5 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/build2/config-vc-stub.h | 5 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/build2/config-vc.h | 15 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/build2/config.h | 17 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/config-vc.h | 5 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/config.h.in | 12 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/config.hxx | 6 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/details/export.hxx | 38 |
8 files changed, 5 insertions, 98 deletions
diff --git a/libodb-mssql/odb/mssql/details/build2/config-stub.h b/libodb-mssql/odb/mssql/details/build2/config-stub.h deleted file mode 100644 index e402d2f..0000000 --- a/libodb-mssql/odb/mssql/details/build2/config-stub.h +++ /dev/null @@ -1,5 +0,0 @@ -/* file : odb/mssql/details/build2/config-stub.h - * license : ODB NCUEL; see accompanying LICENSE file - */ - -#include <odb/mssql/details/config.h> diff --git a/libodb-mssql/odb/mssql/details/build2/config-vc-stub.h b/libodb-mssql/odb/mssql/details/build2/config-vc-stub.h deleted file mode 100644 index 36ae27f..0000000 --- a/libodb-mssql/odb/mssql/details/build2/config-vc-stub.h +++ /dev/null @@ -1,5 +0,0 @@ -/* file : odb/mssql/details/build2/config-vc-stub.h - * license : ODB NCUEL; see accompanying LICENSE file - */ - -#include <odb/mssql/details/config-vc.h> diff --git a/libodb-mssql/odb/mssql/details/build2/config-vc.h b/libodb-mssql/odb/mssql/details/build2/config-vc.h deleted file mode 100644 index 1489d09..0000000 --- a/libodb-mssql/odb/mssql/details/build2/config-vc.h +++ /dev/null @@ -1,15 +0,0 @@ -/* file : odb/mssql/details/build2/config-vc.h - * license : ODB NCUEL; see accompanying LICENSE file - */ - -/* Configuration file for Windows/VC++ for the build2 build. */ - -#ifndef ODB_MSSQL_DETAILS_CONFIG_VC_H -#define ODB_MSSQL_DETAILS_CONFIG_VC_H - -/* Define LIBODB_MSSQL_BUILD2 for the installed case. */ -#ifndef LIBODB_MSSQL_BUILD2 -# define LIBODB_MSSQL_BUILD2 -#endif - -#endif /* ODB_MSSQL_DETAILS_CONFIG_VC_H */ diff --git a/libodb-mssql/odb/mssql/details/build2/config.h b/libodb-mssql/odb/mssql/details/build2/config.h deleted file mode 100644 index de736e2..0000000 --- a/libodb-mssql/odb/mssql/details/build2/config.h +++ /dev/null @@ -1,17 +0,0 @@ -/* file : odb/mssql/details/build2/config.h - * license : ODB NCUEL; see accompanying LICENSE file - */ - -/* Static configuration file for the build2 build. The installed case - (when LIBODB_MSSQL_BUILD2 is not necessarily defined) is the only - reason we have it. */ - -#ifndef ODB_MSSQL_DETAILS_CONFIG_H -#define ODB_MSSQL_DETAILS_CONFIG_H - -/* Define LIBODB_MSSQL_BUILD2 for the installed case. */ -#ifndef LIBODB_MSSQL_BUILD2 -# define LIBODB_MSSQL_BUILD2 -#endif - -#endif /* ODB_MSSQL_DETAILS_CONFIG_H */ diff --git a/libodb-mssql/odb/mssql/details/config-vc.h b/libodb-mssql/odb/mssql/details/config-vc.h deleted file mode 100644 index e93b86b..0000000 --- a/libodb-mssql/odb/mssql/details/config-vc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* file : odb/mssql/details/config-vc.h - * license : ODB NCUEL; see accompanying LICENSE file - */ - -/* Dummy configuration file for Windows/VC++. */ diff --git a/libodb-mssql/odb/mssql/details/config.h.in b/libodb-mssql/odb/mssql/details/config.h.in deleted file mode 100644 index 9ddb75a..0000000 --- a/libodb-mssql/odb/mssql/details/config.h.in +++ /dev/null @@ -1,12 +0,0 @@ -/* file : odb/mssql/details/config.h.in - * license : ODB NCUEL; see accompanying LICENSE file - */ - -/* This file is automatically processed by configure. */ - -#ifndef ODB_MSSQL_DETAILS_CONFIG_H -#define ODB_MSSQL_DETAILS_CONFIG_H - -#undef LIBODB_MSSQL_STATIC_LIB - -#endif /* ODB_MSSQL_DETAILS_CONFIG_H */ diff --git a/libodb-mssql/odb/mssql/details/config.hxx b/libodb-mssql/odb/mssql/details/config.hxx index ff2a5af..1459f2f 100644 --- a/libodb-mssql/odb/mssql/details/config.hxx +++ b/libodb-mssql/odb/mssql/details/config.hxx @@ -8,12 +8,6 @@ #ifdef ODB_COMPILER # error libodb-mssql header included in odb-compiled header -#elif !defined(LIBODB_MSSQL_BUILD2) -# ifdef _MSC_VER -# include <odb/mssql/details/config-vc.h> -# else -# include <odb/mssql/details/config.h> -# endif #endif // no post diff --git a/libodb-mssql/odb/mssql/details/export.hxx b/libodb-mssql/odb/mssql/details/export.hxx index 94e762b..cd74078 100644 --- a/libodb-mssql/odb/mssql/details/export.hxx +++ b/libodb-mssql/odb/mssql/details/export.hxx @@ -6,7 +6,11 @@ #include <odb/pre.hxx> -#include <odb/mssql/details/config.hxx> +// Note: do this check directly instead of including config.hxx. +// +#ifdef ODB_COMPILER +# error libodb-mssql header included in odb-compiled header +#endif // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting @@ -16,8 +20,6 @@ // used before their inline definition. The workaround is to reorder code. In // the end it's all trial and error. -#ifdef LIBODB_MSSQL_BUILD2 - #if defined(LIBODB_MSSQL_STATIC) // Using static. # define LIBODB_MSSQL_EXPORT #elif defined(LIBODB_MSSQL_STATIC_BUILD) // Building static. @@ -43,36 +45,6 @@ # define LIBODB_MSSQL_EXPORT // Using static or shared. #endif -#else // LIBODB_MSSQL_BUILD2 - -#ifdef LIBODB_MSSQL_STATIC_LIB -# define LIBODB_MSSQL_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBODB_MSSQL_DYNAMIC_LIB -# define LIBODB_MSSQL_EXPORT __declspec(dllexport) -# else -# define LIBODB_MSSQL_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBODB_MSSQL_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBODB_MSSQL_EXPORT __declspec(dllexport) -# else -# define LIBODB_MSSQL_EXPORT -# endif -# else -# define LIBODB_MSSQL_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBODB_MSSQL_EXPORT -# endif -#endif - -#endif // LIBODB_MSSQL_BUILD2 - #include <odb/post.hxx> #endif // ODB_MSSQL_DETAILS_EXPORT_HXX |