From b184c21ce0bc72d0c559cd93525628e8fefa62be Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 3 Aug 2016 14:59:54 +0200
Subject: Fold odb/compiler/*/{pre post}.hxx into odb/{pre post}.hxx
We only needed it for one compiler (VC) ever.
---
odb/compilers/vc/post.hxx | 5 -----
odb/compilers/vc/pre.hxx | 23 -----------------------
odb/post.hxx | 2 +-
odb/pre.hxx | 19 ++++++++++++++++++-
4 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 odb/compilers/vc/post.hxx
delete mode 100644 odb/compilers/vc/pre.hxx
diff --git a/odb/compilers/vc/post.hxx b/odb/compilers/vc/post.hxx
deleted file mode 100644
index 442f282..0000000
--- a/odb/compilers/vc/post.hxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// file : odb/compilers/vc/post.hxx
-// copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#pragma warning (pop)
diff --git a/odb/compilers/vc/pre.hxx b/odb/compilers/vc/pre.hxx
deleted file mode 100644
index 47e3cb5..0000000
--- a/odb/compilers/vc/pre.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// file : odb/compilers/vc/pre.hxx
-// copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-// Push warning state.
-//
-#pragma warning (push, 3)
-
-// Disabled warnings.
-//
-#pragma warning (disable:4068) // unknown pragma
-#pragma warning (disable:4251) // needs to have DLL-interface
-#pragma warning (disable:4290) // exception specification ignored
-#pragma warning (disable:4355) // passing 'this' to a member
-#pragma warning (disable:4800) // forcing value to bool
-#pragma warning (disable:4231) // non-standard extension (extern template)
-#pragma warning (disable:4275) // "C4251 is essentially noise and can be
- // silenced" - Stephan T. Lavavej [And C4275
- // is essentially the same thing.]
-
-// Elevated warnings.
-//
-#pragma warning (2:4239) // standard doesn't allow this conversion
diff --git a/odb/post.hxx b/odb/post.hxx
index fe6e342..423bc49 100644
--- a/odb/post.hxx
+++ b/odb/post.hxx
@@ -3,5 +3,5 @@
// license : GNU GPL v2; see accompanying LICENSE file
#ifdef _MSC_VER
-# include <odb/compilers/vc/post.hxx>
+# pragma warning (pop)
#endif
diff --git a/odb/pre.hxx b/odb/pre.hxx
index 2245c78..3206c7d 100644
--- a/odb/pre.hxx
+++ b/odb/pre.hxx
@@ -3,5 +3,22 @@
// license : GNU GPL v2; see accompanying LICENSE file
#ifdef _MSC_VER
-# include <odb/compilers/vc/pre.hxx>
+ // Push warning state.
+ //
+# pragma warning (push, 3)
+
+ // Disabled warnings.
+ //
+# pragma warning (disable:4068) // unknown pragma
+# pragma warning (disable:4251) // needs to have DLL-interface
+# pragma warning (disable:4290) // exception specification ignored
+# pragma warning (disable:4355) // passing 'this' to a member
+# pragma warning (disable:4800) // forcing value to bool
+# pragma warning (disable:4231) // non-standard extension (extern template)
+# pragma warning (disable:4275) // "C4251 is essentially noise and can be
+ // silenced" - Stephan T. Lavavej [And C4275
+ // is essentially the same thing.]
+ // Elevated warnings.
+ //
+# pragma warning (2:4239) // standard doesn't allow this conversion
#endif
--
cgit v1.1