Remove ABI tags from internal headers.

Author: rsomla1

common/collection.cc

@@ -35,7 +35,7 @@
 #include "op_impl.h"
 
 
-using namespace ::mysqlx::common;
+using namespace ::mysqlx::impl::common;
 
 
 /*

common/common.h

@@ -0,0 +1,46 @@
+#ifndef MYSQLX_COMMON_COMMON_H
+#define MYSQLX_COMMON_COMMON_H
+
+#include <mysqlx/common.h>
+
+
+namespace mysqlx {
+MYSQLX_ABI_BEGIN(2,0)
+namespace common {
+
+class Session_pool;
+class Session_impl;
+class Result_impl;
+class Result_init;
+class Column_info;
+
+using Shared_session_impl = std::shared_ptr<Session_impl>;
+using Session_pool_shared = std::shared_ptr<Session_pool>;
+
+using cdk::col_count_t;
+using cdk::row_count_t;
+
+}
+MYSQLX_ABI_END(2,0)
+}
+
+
+namespace mysqlx {
+namespace impl {
+namespace common {
+
+using namespace mysqlx::common;
+
+using cdk::col_count_t;
+using cdk::row_count_t;
+
+}}}
+
+
+#ifndef THROW_AS_ASSERT
+#undef THROW
+#define THROW(MSG) do { mysqlx::common::throw_error(MSG); throw (MSG); } while(false)
+#endif
+
+
+#endif

common/db_object.h

@@ -31,12 +31,13 @@
 #ifndef MYSQLX_COMMON_DB_OBJECT_H
 #define MYSQLX_COMMON_DB_OBJECT_H
 
+#include "common.h"
+
 #include <mysql/cdk.h>
-#include <mysqlx/common.h>
 
 
 namespace mysqlx {
-MYSQLX_ABI_BEGIN(2,0)
+namespace impl {
 
 // --------------------------------------------------------------------
 
@@ -87,7 +88,6 @@ namespace common {
 
 } // common
 
-MYSQLX_ABI_END(2,0)
-} // mysqlx
+}} // mysqlx::impl
 
 #endif

common/op_impl.h

@@ -31,15 +31,19 @@
 #ifndef MYSQLX_COMMON_OP_IMPL_H
 #define MYSQLX_COMMON_OP_IMPL_H
 
-#include <mysql/cdk.h>
-#include <mysqlx/common.h>
-#include <mysqlx/common/op_if.h>
+#include "common.h"
 #include "session.h"
 #include "result.h"
 #include "db_object.h"
 
+#include <mysql/cdk.h>
+#include <mysqlx/common.h>
+#include <mysqlx/common/op_if.h>
+
+PUSH_SYS_WARNINGS
 #include <bitset>
 #include <list>
+POP_SYS_WARNINGS
 
 
 /*
@@ -48,7 +52,7 @@
 */
 
 namespace mysqlx {
-MYSQLX_ABI_BEGIN(2,0)
+namespace impl {
 namespace common {
 
 enum class Object_type
@@ -1060,13 +1064,13 @@ class Op_projection
 
         Scalar_prc* scalar()
         {
-          throw_error("Scalar expression can not be used as projection");
+          common::throw_error("Scalar expression can not be used as projection");
           return nullptr;
         }
 
         List_prc* arr()
         {
-          throw_error("Array expression can not be used as projection");
+          common::throw_error("Array expression can not be used as projection");
           return nullptr;
         }
 
@@ -1201,7 +1205,7 @@ class Op_select : public Base
     if (m_where_expr.empty())
     {
       if (m_where_set)
-        throw_error("Invalid selection criteria");
+        common::throw_error("Invalid selection criteria");
       return nullptr;
     }
 
@@ -1222,11 +1226,11 @@ class Op_select : public Base
 */
 
 struct Op_sql
-  : public Op_base<common::Bind_if>
+  : public Op_base<Bind_if>
 {
   using string = std::string;
 
-  using Base = Op_base<common::Bind_if>;
+  using Base = Op_base<Bind_if>;
 
   string m_query;
 
@@ -1470,7 +1474,7 @@ struct Op_trx<Trx_op::SAVEPOINT_REMOVE>
     : Op_trx_savepoint(sess, name)
   {
     if (name.empty())
-      throw_error("Invalid empty save point name");
+      common::throw_error("Invalid empty save point name");
   }
 
   cdk::Reply* send_command() override
@@ -1533,7 +1537,7 @@ struct Op_create<Object_type::COLLECTION>
     if (coll.schema())
       add_param("schema", Value::Access::mk_str(coll.schema()->name()));
     else
-      throw_error("No schema specified for create collection operation");
+      common::throw_error("No schema specified for create collection operation");
     add_param("name", Value::Access::mk_str(coll.name()));
     // 1050 = table already exists
     if (reuse)
@@ -1574,7 +1578,7 @@ struct Op_drop
     : Op_admin(sess, "drop_collection")
   {
     if (!obj.schema())
-      throw_error("No schema specified for drop collection/table operation");
+      common::throw_error("No schema specified for drop collection/table operation");
     add_param("schema", obj.schema()->name());
     add_param("name", obj.name());
     // 1051 = collection doesn't exist
@@ -2547,7 +2551,7 @@ class Op_table_insert
   using string = std::string;
   using Row_list = std::list < Row_impl<VAL> >;
   using Col_list = std::list < string >;
-  using Object_ref = mysqlx::common::Object_ref;
+  using Object_ref = impl::common::Object_ref;
 
   Object_ref m_table;
 
@@ -2896,7 +2900,7 @@ class Op_table_remove
 
 
 }  // internal
-MYSQLX_ABI_END(2,0)
+}  // impl
 }  // mysqlx
 
 #endif

common/result.cc

@@ -44,7 +44,7 @@
   into values.
 */
 
-using namespace ::mysqlx::common;
+using namespace ::mysqlx::impl::common;
 
 
 /*
@@ -59,7 +59,8 @@ using namespace ::mysqlx::common;
 
 
 Value
-mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_STRING> &fd)
+mysqlx::impl::common::
+convert(cdk::bytes data, Format_descr<cdk::TYPE_STRING> &fd)
 {
   /*
     String encoding has artificial 0x00 byte appended at the end to
@@ -82,7 +83,8 @@ mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_STRING> &fd)
 
 
 Value
-mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_INTEGER> &fd)
+mysqlx::impl::common::
+convert(cdk::bytes data, Format_descr<cdk::TYPE_INTEGER> &fd)
 {
   auto &codec = fd.m_codec;
   auto &fmt = fd.m_format;
@@ -103,7 +105,8 @@ mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_INTEGER> &fd)
 
 
 Value
-mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_FLOAT> &fd)
+mysqlx::impl::common::
+convert(cdk::bytes data, Format_descr<cdk::TYPE_FLOAT> &fd)
 {
   auto &fmt = fd.m_format;
 
@@ -125,7 +128,8 @@ mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_FLOAT> &fd)
 
 
 Value
-mysqlx::common::convert(cdk::bytes data, Format_descr<cdk::TYPE_DOCUMENT>&)
+mysqlx::impl::common::
+convert(cdk::bytes data, Format_descr<cdk::TYPE_DOCUMENT>&)
 {
   if (0 == data.size())
     return Value();