From 7f50d4e53837f5ac87f3c6a0c7cc6eea11c6e89b Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Mon, 30 May 2011 12:42:50 +0200
Subject: Move endian-traits to odb/pgsql/details folder

---
 odb/pgsql/details/endian-traits.cxx |  32 +++++++++
 odb/pgsql/details/endian-traits.hxx | 138 ++++++++++++++++++++++++++++++++++++
 odb/pgsql/endian-traits.cxx         |  32 ---------
 odb/pgsql/endian-traits.hxx         | 138 ------------------------------------
 odb/pgsql/makefile                  |  22 +++---
 odb/pgsql/statement.cxx             |   2 +-
 6 files changed, 182 insertions(+), 182 deletions(-)
 create mode 100644 odb/pgsql/details/endian-traits.cxx
 create mode 100644 odb/pgsql/details/endian-traits.hxx
 delete mode 100644 odb/pgsql/endian-traits.cxx
 delete mode 100644 odb/pgsql/endian-traits.hxx

(limited to 'odb')

diff --git a/odb/pgsql/details/endian-traits.cxx b/odb/pgsql/details/endian-traits.cxx
new file mode 100644
index 0000000..ee53e49
--- /dev/null
+++ b/odb/pgsql/details/endian-traits.cxx
@@ -0,0 +1,32 @@
+// file      : odb/pgsql/details/endian-traits.cxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <odb/pgsql/details/endian-traits.hxx>
+
+namespace odb
+{
+  namespace pgsql
+  {
+    namespace details
+    {
+      namespace
+      {
+        endian_traits::endian
+        infer_host_endian ()
+        {
+          short s (1);
+          char* c (reinterpret_cast<char*> (&s));
+
+          return *c == 0 ?
+            endian_traits::big :
+            endian_traits::little;
+        }
+      }
+
+      const endian_traits::endian endian_traits::host_endian (
+        infer_host_endian ());
+    }
+  }
+}
diff --git a/odb/pgsql/details/endian-traits.hxx b/odb/pgsql/details/endian-traits.hxx
new file mode 100644
index 0000000..c9b6cff
--- /dev/null
+++ b/odb/pgsql/details/endian-traits.hxx
@@ -0,0 +1,138 @@
+// file      : odb/pgsql/details/endian-traits.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_PGSQL_DETAILS_ENDIAN_TRAITS_HXX
+#define ODB_PGSQL_DETAILS_ENDIAN_TRAITS_HXX
+
+#include <cstddef> // std::size_t
+#include <algorithm> // std::reverse
+
+namespace odb
+{
+  namespace pgsql
+  {
+    namespace details
+    {
+      template <typename T, std::size_t S = sizeof (T)>
+      struct swap_endian;
+
+      template <typename T>
+      struct swap_endian<T, 2>
+      {
+        static T
+        swap (T x)
+        {
+          union u2
+          {
+            T t;
+            char c[2];
+          };
+
+          u2 u;
+          u.t = x;
+
+          char tmp (u.c[0]);
+          u.c[0] = u.c[1];
+          u.c[1] = tmp;
+
+          return u.t;
+        }
+      };
+
+      template <typename T>
+      struct swap_endian<T, 4>
+      {
+        static T
+        swap (T x)
+        {
+          union u4
+          {
+            T t;
+            char c[4];
+          };
+
+          u4 u;
+          u.t = x;
+
+          char tmp (u.c[0]);
+          u.c[0] = u.c[3];
+          u.c[3] = tmp;
+
+          tmp = u.c[1];
+          u.c[1] = u.c[2];
+          u.c[2] = tmp;
+
+          return u.t;
+        }
+      };
+
+      template <typename T>
+      struct swap_endian<T, 8>
+      {
+        static T
+        swap (T x)
+        {
+          union u8
+          {
+            T t;
+            char c[8];
+          };
+
+          u8 u;
+          u.t = x;
+
+          char tmp (u.c[0]);
+          u.c[0] = u.c[7];
+          u.c[7] = tmp;
+
+          tmp = u.c[1];
+          u.c[1] = u.c[6];
+          u.c[6] = tmp;
+
+          tmp = u.c[2];
+          u.c[2] = u.c[5];
+          u.c[5] = tmp;
+
+          tmp = u.c[3];
+          u.c[3] = u.c[4];
+          u.c[4] = tmp;
+
+          return u.t;
+        }
+      };
+
+      class endian_traits
+      {
+      public:
+        enum endian
+        {
+          big,
+          little
+        };
+
+      public:
+        static const endian host_endian;
+
+      public:
+
+        template <typename T>
+        static T
+        hton (T x)
+        {
+          return host_endian == big ? x : swap_endian<T>::swap (x);
+        }
+
+        template <typename T>
+        static T
+        ntoh (T x)
+        {
+          return host_endian == big ? x : swap_endian<T>::swap (x);
+        }
+      };
+    }
+  }
+}
+
+#endif // ODB_PGSQL_DETAILS_ENDIAN_TRAITS_HXX
diff --git a/odb/pgsql/endian-traits.cxx b/odb/pgsql/endian-traits.cxx
deleted file mode 100644
index 00420d0..0000000
--- a/odb/pgsql/endian-traits.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-// file      : odb/pgsql/endian-traits.cxx
-// author    : Constantin Michael <constantin@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#include <odb/pgsql/endian-traits.hxx>
-
-namespace odb
-{
-  namespace pgsql
-  {
-    namespace details
-    {
-      namespace
-      {
-        endian_traits::endian
-        infer_host_endian ()
-        {
-          short s (1);
-          char* c (reinterpret_cast<char*> (&s));
-
-          return *c == 0 ?
-            endian_traits::big :
-            endian_traits::little;
-        }
-      }
-
-      const endian_traits::endian endian_traits::host_endian (
-        infer_host_endian ());
-    }
-  }
-}
diff --git a/odb/pgsql/endian-traits.hxx b/odb/pgsql/endian-traits.hxx
deleted file mode 100644
index 2dc79f3..0000000
--- a/odb/pgsql/endian-traits.hxx
+++ /dev/null
@@ -1,138 +0,0 @@
-// file      : odb/pgsql/endian-traits.hxx
-// author    : Constantin Michael <constantin@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef ODB_PGSQL_ENDIAN_TRAITS_HXX
-#define ODB_PGSQL_ENDIAN_TRAITS_HXX
-
-#include <cstddef> // std::size_t
-#include <algorithm> // std::reverse
-
-namespace odb
-{
-  namespace pgsql
-  {
-    namespace details
-    {
-      template <typename T, std::size_t S = sizeof (T)>
-      struct swap_endian;
-
-      template <typename T>
-      struct swap_endian<T, 2>
-      {
-        static T
-        swap (T x)
-        {
-          union u2
-          {
-            T t;
-            char c[2];
-          };
-
-          u2 u;
-          u.t = x;
-
-          char tmp (u.c[0]);
-          u.c[0] = u.c[1];
-          u.c[1] = tmp;
-
-          return u.t;
-        }
-      };
-
-      template <typename T>
-      struct swap_endian<T, 4>
-      {
-        static T
-        swap (T x)
-        {
-          union u4
-          {
-            T t;
-            char c[4];
-          };
-
-          u4 u;
-          u.t = x;
-
-          char tmp (u.c[0]);
-          u.c[0] = u.c[3];
-          u.c[3] = tmp;
-
-          tmp = u.c[1];
-          u.c[1] = u.c[2];
-          u.c[2] = tmp;
-
-          return u.t;
-        }
-      };
-
-      template <typename T>
-      struct swap_endian<T, 8>
-      {
-        static T
-        swap (T x)
-        {
-          union u8
-          {
-            T t;
-            char c[8];
-          };
-
-          u8 u;
-          u.t = x;
-
-          char tmp (u.c[0]);
-          u.c[0] = u.c[7];
-          u.c[7] = tmp;
-
-          tmp = u.c[1];
-          u.c[1] = u.c[6];
-          u.c[6] = tmp;
-
-          tmp = u.c[2];
-          u.c[2] = u.c[5];
-          u.c[5] = tmp;
-
-          tmp = u.c[3];
-          u.c[3] = u.c[4];
-          u.c[4] = tmp;
-
-          return u.t;
-        }
-      };
-
-      class endian_traits
-      {
-      public:
-        enum endian
-        {
-          big,
-          little
-        };
-
-      public:
-        static const endian host_endian;
-
-      public:
-
-        template <typename T>
-        static T
-        hton (T x)
-        {
-          return host_endian == big ? x : swap_endian<T>::swap (x);
-        }
-
-        template <typename T>
-        static T
-        ntoh (T x)
-        {
-          return host_endian == big ? x : swap_endian<T>::swap (x);
-        }
-      };
-    }
-  }
-}
-
-#endif // ODB_PGSQL_ENDIAN_TRAITS_HXX
diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile
index 98c4479..38c4a59 100644
--- a/odb/pgsql/makefile
+++ b/odb/pgsql/makefile
@@ -6,17 +6,17 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
-cxx :=                 \
-connection.cxx         \
-connection-factory.cxx \
-database.cxx           \
-endian-traits.cxx      \
-error.cxx              \
-exceptions.cxx         \
-object-statements.cxx  \
-statement.cxx          \
-transaction.cxx        \
-transaction-impl.cxx
+cxx :=                    \
+connection.cxx            \
+connection-factory.cxx    \
+database.cxx              \
+error.cxx                 \
+exceptions.cxx            \
+object-statements.cxx     \
+statement.cxx             \
+transaction.cxx           \
+transaction-impl.cxx      \
+details/endian-traits.cxx \
 
 cli_tun := details/options.cli
 cxx_tun := $(cxx)
diff --git a/odb/pgsql/statement.cxx b/odb/pgsql/statement.cxx
index 98aecb9..98627ee 100644
--- a/odb/pgsql/statement.cxx
+++ b/odb/pgsql/statement.cxx
@@ -13,7 +13,7 @@
 #include <odb/pgsql/connection.hxx>
 #include <odb/pgsql/transaction.hxx>
 #include <odb/pgsql/error.hxx>
-#include <odb/pgsql/endian-traits.hxx>
+#include <odb/pgsql/details/endian-traits.hxx>
 
 using namespace std;
 
-- 
cgit v1.1