Add __cdecl to main() in examples

Author: eramongodb

.evergreen/build_snapshot_rpm.sh

@@ -124,10 +124,10 @@ sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "${mock
 
 sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
   rpm -Uvh ../mock-result/*.rpm &&
-  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -o runcommand_examples examples/mongocxx/mongodb.com/runcommand_examples.cpp -lmongocxx -lbsoncxx &&
-  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -o aggregation_examples examples/mongocxx/mongodb.com/aggregation_examples.cpp -lmongocxx -lbsoncxx &&
-  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -o index_examples examples/mongocxx/mongodb.com/index_examples.cpp -lmongocxx -lbsoncxx &&
-  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -o documentation_examples examples/mongocxx/mongodb.com/documentation_examples.cpp -lmongocxx -lbsoncxx
+  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -I. -o runcommand_examples examples/mongocxx/mongodb.com/runcommand_examples.cpp -lmongocxx -lbsoncxx &&
+  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -I. -o aggregation_examples examples/mongocxx/mongodb.com/aggregation_examples.cpp -lmongocxx -lbsoncxx &&
+  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -I. -o index_examples examples/mongocxx/mongodb.com/index_examples.cpp -lmongocxx -lbsoncxx &&
+  /usr/bin/g++ -I/usr/include/bsoncxx/v_noabi -I/usr/include/mongocxx/v_noabi -I. -o documentation_examples examples/mongocxx/mongodb.com/documentation_examples.cpp -lmongocxx -lbsoncxx
   )"
 
 if [ ! -e "${mock_root}/tmp/${build_dir}/runcommand_examples" ]; then

examples/CMakeLists.txt

@@ -66,6 +66,9 @@ function(add_examples_executable source)
     add_executable(${target_name} EXCLUDE_FROM_ALL ${source})
     target_link_libraries(${target_name} PRIVATE ${PARSED_LIBRARIES})
 
+    # Permit `#include <examples/macros.hh>`.
+    target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
     # Keep executables in separate directories.
     set_target_properties(${target_name} PROPERTIES
         OUTPUT_NAME ${name}
@@ -123,6 +126,12 @@ file(GLOB_RECURSE mongocxx_examples_sources
     "mongocxx/*.cpp"
 )
 
+file(GLOB_RECURSE examples_headers
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    CONFIGURE_DEPENDS
+    "*.hh"
+)
+
 foreach(source ${api_examples_sources})
     add_examples_executable(${source} LIBRARIES mongocxx_target)
 endforeach()
@@ -155,6 +164,7 @@ set_local_dist (examples_DIST_local
    ${api_examples_sources}
    ${bsoncxx_examples_sources}
    ${mongocxx_examples_sources}
+   ${examples_headers}
    README.md
    add_subdirectory/.gitignore
    add_subdirectory/CMakeLists.txt

examples/bsoncxx/builder_basic.cpp

@@ -19,9 +19,11 @@
 #include <bsoncxx/builder/basic/kvp.hpp>
 #include <bsoncxx/types.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // bsoncxx::builder::basic presents a BSON-construction interface familiar to users of the
     // server's
     // BSON library or the Java driver.

examples/bsoncxx/builder_core.cpp

@@ -15,9 +15,11 @@
 #include <bsoncxx/builder/core.hpp>
 #include <bsoncxx/types.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // bsoncxx::builder::core is a low-level primitive that can be useful for building other
     // BSON abstractions. Most users should just use builder::stream or builder::basic.
 

examples/bsoncxx/builder_list.cpp

@@ -18,9 +18,11 @@
 #include <bsoncxx/types.hpp>
 #include <bsoncxx/types/bson_value/value.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     using namespace bsoncxx::builder;
 
     //

examples/bsoncxx/builder_stream.cpp

@@ -17,9 +17,11 @@
 #include <bsoncxx/builder/stream/helpers.hpp>
 #include <bsoncxx/types.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     using builder::stream::array;
     using builder::stream::document;
 

examples/bsoncxx/builder_stream_customization.cpp

@@ -19,6 +19,8 @@
 #include <bsoncxx/builder/stream/document.hpp>
 #include <bsoncxx/json.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
 // concatenates arbitrary ranges into an array context
@@ -68,7 +70,7 @@ range_kvp_appender<begin_t, end_t> make_range_kvp_appender(begin_t&& begin, end_
                                               std::forward<end_t>(end));
 }
 
-int main() {
+int EXAMPLES_CDECL main() {
     using builder::stream::array;
     using builder::stream::document;
     using builder::stream::finalize;

examples/bsoncxx/decimal128.cpp

@@ -20,9 +20,11 @@
 #include <bsoncxx/exception/exception.hpp>
 #include <bsoncxx/types.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // Convert a string to BSON Decimal128.
     decimal128 d128;
     try {

examples/bsoncxx/getting_values.cpp

@@ -21,9 +21,11 @@
 
 #include <bsoncxx/config/prelude.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     using namespace builder::stream;
 
     builder::stream::document build_doc;

examples/bsoncxx/view_and_value.cpp

@@ -29,9 +29,11 @@
 #include <bsoncxx/types.hpp>
 #include <bsoncxx/types/bson_value/view.hpp>
 
+#include <examples/macros.hh>
+
 using namespace bsoncxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // This example will cover the read-only BSON interface.
 
     // Lets first build up a non-trivial BSON document using the builder interface.

examples/macros.hh

@@ -0,0 +1,21 @@
+// Copyright 2009-present MongoDB, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#if defined(_MSC_VER)
+#define EXAMPLES_CDECL __cdecl
+#else
+#define EXAMPLES_CDECL
+#endif

examples/mongocxx/aggregate.cpp

@@ -22,10 +22,12 @@
 #include <mongocxx/pipeline.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,
     // respectively. Therefore, a mongocxx::instance must be created before using the driver and
     // must remain alive for as long as the driver is in use.

examples/mongocxx/automatic_client_side_field_level_encryption.cpp

@@ -32,6 +32,8 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 

examples/mongocxx/bulk_write.cpp

@@ -22,10 +22,12 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,
     // respectively. Therefore, a mongocxx::instance must be created before using the driver and
     // must remain alive for as long as the driver is in use.

examples/mongocxx/causal_consistency.cpp

@@ -31,12 +31,14 @@
 #include <mongocxx/uri.hpp>
 #include <mongocxx/write_concern.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::stream::close_document;
 using bsoncxx::builder::stream::document;
 using bsoncxx::builder::stream::finalize;
 using bsoncxx::builder::stream::open_document;
 
-int main() {
+int EXAMPLES_CDECL main() {
     if (const char* const topology_env = std::getenv("MONGOCXX_TEST_TOPOLOGY")) {
         const auto topology = std::string(topology_env);
         if (topology != "replica") {

examples/mongocxx/change_streams.cpp

@@ -26,6 +26,8 @@
 #include <mongocxx/pool.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 namespace {
 
 // watch_forever iterates the change stream until an error occurs.
@@ -47,7 +49,7 @@ namespace {
 
 }  // namespace
 
-int main(int argc, char* argv[]) {
+int EXAMPLES_CDECL main(int argc, char* argv[]) {
     if (std::getenv("MONGOCXX_TEST_TOPOLOGY")) {
         std::cerr << "Skipping: change_streams example should not be run by tests" << std::endl;
         return 0;

examples/mongocxx/client_session.cpp

@@ -23,12 +23,14 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::to_json;
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 using namespace mongocxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     if (const char* const topology_env = std::getenv("MONGOCXX_TEST_TOPOLOGY")) {
         const auto topology = std::string(topology_env);
         if (topology != "replica") {

examples/mongocxx/connect.cpp

@@ -25,6 +25,8 @@
 #include <mongocxx/options/client.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 namespace {
 
 class logger final : public mongocxx::logger {
@@ -50,7 +52,7 @@ std::unique_ptr<logger> make_logger() {
 
 }  // namespace
 
-int main(int argc, char* argv[]) {
+int EXAMPLES_CDECL main(int argc, char* argv[]) {
     using bsoncxx::builder::basic::kvp;
     using bsoncxx::builder::basic::make_document;
 

examples/mongocxx/create.cpp

@@ -22,11 +22,13 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_array;
 using bsoncxx::builder::basic::make_document;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,
     // respectively. Therefore, a mongocxx::instance must be created before using the driver and
     // must remain alive for as long as the driver is in use.

examples/mongocxx/document_validation.cpp

@@ -22,13 +22,15 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 using bsoncxx::stdx::string_view;
 using mongocxx::collection;
 using mongocxx::validation_criteria;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,
     // respectively. Therefore, a mongocxx::instance must be created before using the driver and
     // must remain alive for as long as the driver is in use.

examples/mongocxx/exception.cpp

@@ -27,10 +27,12 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // Do not print error messages when run in CI to prevent MSBuild diagnostic format detection
     // from causing build failures. There is currently no way to specify
     // IgnoreStandardErrorWarningFormat=true via CMake or CLI. See:

examples/mongocxx/explicit_encryption.cpp

@@ -31,6 +31,8 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
@@ -45,7 +47,7 @@ using namespace mongocxx;
 
 const int kKeyLength = 96;
 
-int main() {
+int EXAMPLES_CDECL main() {
     instance inst{};
 
     // This must be the same master key that was used to create

examples/mongocxx/explicit_encryption_auto_decryption.cpp

@@ -31,6 +31,8 @@
 #include <mongocxx/options/data_key.hpp>
 #include <mongocxx/options/encrypt.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
@@ -45,7 +47,7 @@ using namespace mongocxx;
 
 const int kKeyLength = 96;
 
-int main() {
+int EXAMPLES_CDECL main() {
     instance inst{};
 
     // This must be the same master key that was used to create

examples/mongocxx/get_values_from_documents.cpp

@@ -20,6 +20,8 @@
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::type;
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_array;

examples/mongocxx/gridfs.cpp

@@ -22,9 +22,11 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using namespace mongocxx;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,
     // respectively. Therefore, a mongocxx::instance must be created before using the driver and
     // must remain alive for as long as the driver is in use.

examples/mongocxx/index.cpp

@@ -18,10 +18,12 @@
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include <examples/macros.hh>
+
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
-int main() {
+int EXAMPLES_CDECL main() {
     // The mongocxx::instance constructor and destructor initialize and shut down the driver,
     // respectively. Therefore, a mongocxx::instance must be created before using the driver and
     // must remain alive for as long as the driver is in use.