Remove PUBLIC_API from mysqlx::string and other basic types.

Note: These types are implemented entirely in public headers, so this should be OK.

Author: rsomla1

devapi/collection_crud.cc

@@ -550,7 +550,7 @@ class Op_collection_modify
 
   void process(Update_spec::Processor &prc) const override
   {
-    Doc_field_parser doc_field(m_update_it->m_field);
+    Doc_field_parser doc_field((mysqlx::string)m_update_it->m_field);
 
     switch (m_update_it->m_op)
     {

devapi/impl.h

@@ -204,7 +204,7 @@ class Value_expr
         for (Field fld : doc)
         {
           Value_expr value(doc[fld], m_is_expr, m_parser_mode);
-          value.process_if(dprc->key_val(fld));
+          value.process_if(dprc->key_val((string)fld));
         }
         dprc->doc_end();
       }

devapi/session.cc

@@ -1127,6 +1127,8 @@ SqlStatement& NodeSession::sql(const string &query)
 // ---------------------------------------------------------------------
 
 
+#if 0
+
 string::string(const std::string &other)
   : std::wstring(cdk::string(other))
 {}
@@ -1142,6 +1144,20 @@ string::operator std::string() const
   return std::string(cdk::string(*this));
 }
 
+#endif
+
+
+std::string string::Impl::to_utf8(const string &other)
+{
+  return cdk::string(other);
+}
+
+void string::Impl::from_utf8(string &s, const std::string &other)
+{
+  s = cdk::string(other);
+}
+
+
 /*
 string::operator const cdk::foundation::string&() const
 {

include/devapi/common.h

@@ -93,10 +93,15 @@ struct List_init
   Currently only utf-8 encoding is supported.
 */
 
-DLL_WARNINGS_PUSH
-
-class PUBLIC_API string : public std::wstring
+class string : public std::wstring
 {
+
+  struct Impl
+  {
+    PUBLIC_API static std::string to_utf8(const string&);
+    PUBLIC_API static void from_utf8(string&, const std::string&);
+  };
+
 public:
 
   string() {}
@@ -117,15 +122,27 @@ class PUBLIC_API string : public std::wstring
 
   // TODO: make utf8 conversions explicit
 
-  string(const char*);
-  string(const std::string&);
+  string(const char *other)
+  {
+    if (!other)
+      return;
+    std::string utf8(other);
+    Impl::from_utf8(*this, utf8);
+  }
 
-  //  operator cdk::foundation::string&();
-  operator std::string() const;  // conversion to utf-8
-  //  operator const cdk::foundation::string&() const;
-};
+  string(const std::string &other)
+  {
+    Impl::from_utf8(*this, other);
+  }
 
-DLL_WARNINGS_POP
+  // conversion to utf-8
+
+  operator std::string() const
+  {
+    return Impl::to_utf8(*this);
+  }
+
+};
 
 
 inline
@@ -161,7 +178,7 @@ typedef unsigned long row_count_t;
     bytes buf = std::get_temporary_buffer<byte>(size);
 */
 
-class PUBLIC_API bytes : public std::pair<byte*, size_t>
+class bytes : public std::pair<byte*, size_t>
 {
 
 public:
@@ -200,7 +217,7 @@ class PUBLIC_API bytes : public std::pair<byte*, size_t>
 
 namespace internal {
 
-  class PUBLIC_API nocopy
+  class nocopy
   {
   public:
     nocopy(const nocopy&) = delete;

include/devapi/document.h

@@ -57,20 +57,46 @@ class DocResult;
   TODO: _fld suffix
 */
 
-class PUBLIC_API Field : public string
+class PUBLIC_API Field
 {
+  DLL_WARNINGS_PUSH
+    string m_fld;
+  DLL_WARNINGS_POP
+
 public:
 
-  Field(const string &s) : string(s)
+  Field(const string &s) : m_fld(s)
   {}
 
   // TODO: is it auto generated?
-  Field(string &&s) : string(std::move(s))
+  Field(string &&s) : m_fld(std::move(s))
   {}
 
-  Field(const char *s) : string(s)
+  Field(const char *s) : m_fld(s)
   {}
 
+  operator const string&() const { return m_fld; }
+
+  bool operator <(const Field &other) const
+  {
+    return m_fld < other.m_fld;
+  }
+
+  bool operator >(const Field &other) const
+  {
+    return m_fld > other.m_fld;
+  }
+
+  bool operator ==(const Field &other) const
+  {
+    return m_fld == other.m_fld;
+  }
+
+  bool operator !=(const Field &other) const
+  {
+    return m_fld != other.m_fld;
+  }
+
 };
 
 
@@ -407,11 +433,11 @@ class PUBLIC_API Value : public internal::Printable
 
   typedef std::vector<Value> Array;
 
-  bytes  m_raw;
-  string m_str;
   DbDoc  m_doc;
 
   DLL_WARNINGS_PUSH
+  bytes  m_raw;
+  string m_str;
   std::shared_ptr<Array>  m_arr;
   DLL_WARNINGS_POP
 

include/devapi/result.h

@@ -222,7 +222,10 @@ class PUBLIC_API Warning : public internal::Printable
 
   Level    m_level;
   uint16_t m_code;
+
+  DLL_WARNINGS_PUSH
   string   m_msg;
+  DLL_WARNINGS_POP
 
   Warning(Level level, uint16_t code, const string &msg)
     : m_level(level), m_code(code), m_msg(msg)
@@ -272,8 +275,13 @@ namespace internal {
 
   class XSession_base;
 
+  DLL_WARNINGS_PUSH
+
   class PUBLIC_API BaseResult : nocopy
   {
+
+  DLL_WARNINGS_PUSH
+
     class INTERNAL Impl;
     Impl  *m_impl = NULL;
     bool m_owns_impl = false;

include/mysql_devapi.h

@@ -77,7 +77,10 @@ class PUBLIC_API DatabaseObject
 protected:
 
   internal::XSession_base *m_sess;
+
+  DLL_WARNINGS_PUSH
   string m_name;
+  DLL_WARNINGS_POP
 
   DatabaseObject(internal::XSession_base& sess, const string& name = string())
     : m_sess(&sess), m_name(name)
@@ -499,8 +502,13 @@ namespace internal {
     @todo Add all `XSession` methods defined by DevAPI.
   */
 
+  DLL_WARNINGS_PUSH
+
   class PUBLIC_API XSession_base : nocopy
   {
+
+  DLL_WARNINGS_POP
+
   protected:
 
     class INTERNAL Impl;