rename LIBMONGOCXX_API and LIBBSONCXX_API macros to MONGOCXX_API and BSONCXX_API, respectively

Author: amidvidy

src/bsoncxx/CMakeLists.txt

@@ -82,10 +82,11 @@ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 generate_export_header(bsoncxx
-    BASE_NAME LIBBSONCXX
-    EXPORT_MACRO_NAME LIBBSONCXX_API
+    BASE_NAME BSONCXX
+    EXPORT_MACRO_NAME BSONCXX_API
+    NO_EXPORT_MACRO_NAME BSONCXX_PRIVATE
     EXPORT_FILE_NAME export.hpp
-    STATIC_DEFINE LIBBSONCXX_STATIC
+    STATIC_DEFINE BSONCXX_STATIC
 )
 
 # install generated files

src/bsoncxx/builder/concrete.hpp

@@ -28,7 +28,7 @@ namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
 namespace builder {
 
-class LIBBSONCXX_API concrete {
+class BSONCXX_API concrete {
 
    public:
     class impl;

src/bsoncxx/builder/helpers.hpp

@@ -35,7 +35,7 @@ extern close_doc_t close_doc;
 struct close_array_t {};
 extern close_array_t close_array;
 
-struct LIBBSONCXX_API concat {
+struct BSONCXX_API concat {
     document::view view;
 
     operator document::view() const { return view; }

src/bsoncxx/document/element.hpp

@@ -62,7 +62,7 @@ namespace document {
 
     class view;
 
-    class LIBBSONCXX_API element {
+    class BSONCXX_API element {
         friend class document::view;
         friend class builder::concrete;
 

src/bsoncxx/document/value.hpp

@@ -25,7 +25,7 @@ namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
 namespace document {
 
-class LIBBSONCXX_API value {
+class BSONCXX_API value {
    using deleter_type = void(*)(void*);
 
    public:

src/bsoncxx/document/view.hpp

@@ -29,7 +29,7 @@ namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
 namespace document {
 
-class LIBBSONCXX_API view {
+class BSONCXX_API view {
 
    public:
     class iterator;

src/bsoncxx/document/view_or_value.hpp

@@ -23,7 +23,7 @@ namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
 namespace document {
 
-class LIBBSONCXX_API view_or_value {
+class BSONCXX_API view_or_value {
 
    public:
     view_or_value(bsoncxx::document::view view);

src/mongocxx/CMakeLists.txt

@@ -89,14 +89,14 @@ configure_file (
     ${PROJECT_BINARY_DIR}/version.hpp
 )
 
-# TODO: MONGOCXX_SHARED_NO_EXPORT -> LIBMONGOCXX_PRIVATE
 # TODO: LIBMONGOCXX_EXPORTS -> LIBMONGOCXX_BUILDING
 # TODO: Need deprecated defines? or do the same?
 generate_export_header (mongocxx
-    BASE_NAME LIBMONGOCXX
-    EXPORT_MACRO_NAME LIBMONGOCXX_API
+    BASE_NAME MONGOCXX
+    EXPORT_MACRO_NAME MONGOCXX_API
+    NO_EXPORT_MACRO_NAME MONGOCXX_PRIVATE
     EXPORT_FILE_NAME export.hpp
-    STATIC_DEFINE LIBMONGOCXX_STATIC
+    STATIC_DEFINE MONGOCXX_STATIC
 )
 
 configure_file (

src/mongocxx/bulk_write.hpp

@@ -45,7 +45,7 @@ class collection;
 /// @see http://docs.mongodb.org/manual/core/write-operations/
 /// @see http://docs.mongodb.org/manual/core/bulk-write-operations/
 ///
-class LIBMONGOCXX_API bulk_write {
+class MONGOCXX_API bulk_write {
 
    public:
 

src/mongocxx/client.hpp

@@ -46,7 +46,7 @@ MONGOCXX_INLINE_NAMESPACE_BEGIN
 /// @todo Make iterable for databases on the server
 /// @todo Add + implement missing client api methods
 ///
-class LIBMONGOCXX_API client {
+class MONGOCXX_API client {
 
    public:
 

src/mongocxx/collection.hpp

@@ -69,7 +69,7 @@ class pipeline;
 ///
 /// @todo Make this class copyable when C driver supports this.
 ///
-class LIBMONGOCXX_API collection {
+class MONGOCXX_API collection {
 
    public:
 

src/mongocxx/cursor.hpp

@@ -32,7 +32,7 @@ class collection;
 ///
 /// @note By default, cursors timeout after 10 minutes of inactivity.
 ///
-class LIBMONGOCXX_API cursor {
+class MONGOCXX_API cursor {
 
    public:
 

src/mongocxx/database.hpp

@@ -38,7 +38,7 @@ class client;
 /// @todo Make copyable when c-driver supports this
 /// @todo Add auth functions (add_user, remove_all_users, remove_user)
 
-class LIBMONGOCXX_API database {
+class MONGOCXX_API database {
 
    public:
 

src/mongocxx/exception/authentication.hpp

@@ -20,7 +20,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace exception {
 
-class LIBMONGOCXX_API authentication : public operation {};
+class MONGOCXX_API authentication : public operation {};
 
 }  // namespace exception
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/exception/base.hpp

@@ -20,7 +20,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace exception {
 
-class LIBMONGOCXX_API base : public std::exception {};
+class MONGOCXX_API base : public std::exception {};
 
 }  // namespace exception
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/exception/bulk_write.hpp

@@ -20,7 +20,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace exception {
 
-class LIBMONGOCXX_API bulk_write : public write {};
+class MONGOCXX_API bulk_write : public write {};
 
 }  // namespace exception
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/exception/operation.hpp

@@ -20,7 +20,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace exception {
 
-class LIBMONGOCXX_API operation : public base {};
+class MONGOCXX_API operation : public base {};
 
 }  // namespace exception
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/exception/query.hpp

@@ -20,7 +20,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace exception {
 
-class LIBMONGOCXX_API query : public operation {};
+class MONGOCXX_API query : public operation {};
 
 }  // namespace exception
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/exception/write.hpp

@@ -20,7 +20,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace exception {
 
-class LIBMONGOCXX_API write : public operation {};
+class MONGOCXX_API write : public operation {};
 
 }  // namespace exception
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/instance.hpp

@@ -26,7 +26,7 @@ MONGOCXX_INLINE_NAMESPACE_BEGIN
 ///
 /// Life cycle: An instance of the driver *MUST* be kept around.
 ///
-class LIBMONGOCXX_API instance {
+class MONGOCXX_API instance {
 
    public:
     ///

src/mongocxx/model/delete_many.hpp

@@ -25,7 +25,7 @@ namespace model {
 ///
 /// Class representing a MongoDB delete operation that removes multiple documents.
 ///
-class LIBMONGOCXX_API delete_many {
+class MONGOCXX_API delete_many {
 
    public:
 

src/mongocxx/model/delete_one.hpp

@@ -25,7 +25,7 @@ namespace model {
 ///
 /// Class representing a MongoDB delete operation that removes a single document.
 ///
-class LIBMONGOCXX_API delete_one {
+class MONGOCXX_API delete_one {
 
    public:
 

src/mongocxx/model/insert_one.hpp

@@ -25,7 +25,7 @@ namespace model {
 ///
 /// Class representing a MongoDB insert operation that creates a single document.
 ///
-class LIBMONGOCXX_API insert_one {
+class MONGOCXX_API insert_one {
 
    public:
 

src/mongocxx/model/replace_one.hpp

@@ -26,7 +26,7 @@ namespace model {
 ///
 /// Class representing a MongoDB update operation that replaces a single document.
 ///
-class LIBMONGOCXX_API replace_one {
+class MONGOCXX_API replace_one {
 
    public:
     ///

src/mongocxx/model/update_many.hpp

@@ -26,7 +26,7 @@ namespace model {
 ///
 /// Class representing a MongoDB update operation that modifies multiple documents.
 ///
-class LIBMONGOCXX_API update_many {
+class MONGOCXX_API update_many {
 
    public:
 

src/mongocxx/model/update_one.hpp

@@ -26,7 +26,7 @@ namespace model {
 ///
 /// Class representing a MongoDB update operation that modifies a single document.
 ///
-class LIBMONGOCXX_API update_one {
+class MONGOCXX_API update_one {
 
    public:
 

src/mongocxx/model/write.hpp

@@ -31,7 +31,7 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace model {
 
-class LIBMONGOCXX_API write {
+class MONGOCXX_API write {
 
    public:
     write(insert_one value);

src/mongocxx/options/aggregate.hpp

@@ -29,7 +29,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB aggregation operation.
 ///
-class LIBMONGOCXX_API aggregate {
+class MONGOCXX_API aggregate {
 
    public:
 

src/mongocxx/options/bulk_write.hpp

@@ -25,7 +25,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB bulk write
 ///
-class LIBMONGOCXX_API bulk_write {
+class MONGOCXX_API bulk_write {
 
    public:
 

src/mongocxx/options/client.hpp

@@ -30,7 +30,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB driver client object.
 ///
-class LIBMONGOCXX_API client {
+class MONGOCXX_API client {
 
    public:
 

src/mongocxx/options/count.hpp

@@ -33,7 +33,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB count command
 ///
-class LIBMONGOCXX_API count {
+class MONGOCXX_API count {
 
    public:
 

src/mongocxx/options/delete.hpp

@@ -27,7 +27,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB delete operation
 ///
-class LIBMONGOCXX_API delete_options {
+class MONGOCXX_API delete_options {
 
    public:
 

src/mongocxx/options/distinct.hpp

@@ -30,7 +30,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB distinct command.
 ///
-class LIBMONGOCXX_API distinct {
+class MONGOCXX_API distinct {
 
    public:
 

src/mongocxx/options/find.hpp

@@ -29,7 +29,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB query.
 ///
-class LIBMONGOCXX_API find {
+class MONGOCXX_API find {
 
    public:
     enum class cursor_type: std::uint8_t;

src/mongocxx/options/find_one_and_delete.hpp

@@ -29,7 +29,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB find_and_modify delete operation
 ///
-class LIBMONGOCXX_API find_one_and_delete {
+class MONGOCXX_API find_one_and_delete {
 
    public:
 

src/mongocxx/options/find_one_and_replace.hpp

@@ -29,7 +29,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB find_and_modify replace operation
 ///
-class LIBMONGOCXX_API find_one_and_replace {
+class MONGOCXX_API find_one_and_replace {
 
    public:
 

src/mongocxx/options/find_one_and_update.hpp

@@ -29,7 +29,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB find_and_modify update operation.
 ///
-class LIBMONGOCXX_API find_one_and_update {
+class MONGOCXX_API find_one_and_update {
 
    public:
 

src/mongocxx/options/insert.hpp

@@ -27,7 +27,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB insert operation
 ///
-class LIBMONGOCXX_API insert {
+class MONGOCXX_API insert {
 
    public:
 

src/mongocxx/options/ssl.hpp

@@ -27,7 +27,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB driver client (SSL)
 ///
-class LIBMONGOCXX_API ssl {
+class MONGOCXX_API ssl {
 
    public:
     void pem_file(std::string pem_file);

src/mongocxx/options/update.hpp

@@ -27,7 +27,7 @@ namespace options {
 ///
 /// Class representing the optional arguments to a MongoDB update operation.
 ///
-class LIBMONGOCXX_API update {
+class MONGOCXX_API update {
 
    public:
 

src/mongocxx/pipeline.hpp

@@ -30,7 +30,7 @@ class collection;
 ///
 /// Class representing a MongoDB aggregation pipeline.
 ///
-class LIBMONGOCXX_API pipeline {
+class MONGOCXX_API pipeline {
 
    public:
 

src/mongocxx/read_preference.hpp

@@ -49,7 +49,7 @@ class database;
 ///
 /// @see http://docs.mongodb.org/manual/core/read-preference/
 ///
-class LIBMONGOCXX_API read_preference {
+class MONGOCXX_API read_preference {
 
    public: