SERVER-3364 Label enough of the client api with MONGO_CLIENT_API to build httpClientTest.

3 files changed, 16 insertions, 11 deletions

diff --git a/src/mongo/base/generate_error_codes.py b/src/mongo/base/generate_error_codes.py
index 86f0f62532c..19330d1ff57 100644
--- a/src/mongo/base/generate_error_codes.py
+++ b/src/mongo/base/generate_error_codes.py
@@ -159,6 +159,7 @@ header_template = '''// AUTO-GENERATED FILE DO NOT EDIT
 #pragma once
 
 #include "mongo/base/string_data.h"
+#include "mongo/client/export_macros.h"
 
 namespace mongo {
 
@@ -169,7 +170,7 @@ namespace mongo {
      * Do not update this file directly. Update src/mongo/base/error_codes.err instead.
      */
 
-    class ErrorCodes {
+    class MONGO_CLIENT_API ErrorCodes {
     public:
         enum Error {
             %(error_code_enum_declarations)s,
diff --git a/src/mongo/base/initializer.h b/src/mongo/base/initializer.h
index 9e659506903..d81645302ea 100644
--- a/src/mongo/base/initializer.h
+++ b/src/mongo/base/initializer.h
@@ -22,6 +22,7 @@
 #include "mongo/base/initializer_context.h"
 #include "mongo/base/initializer_dependency_graph.h"
 #include "mongo/base/status.h"
+#include "mongo/client/export_macros.h"
 
 namespace mongo {
 
@@ -33,7 +34,7 @@ namespace mongo {
      * edges to the graph.  Then, one executes the process, causing each initialization operation to
      * execute in an order that respects the programmer-established prerequistes.
      */
-    class Initializer {
+    class MONGO_CLIENT_API Initializer {
         MONGO_DISALLOW_COPYING(Initializer);
     public:
         Initializer();
@@ -67,15 +68,17 @@ namespace mongo {
      * This means that the few initializers that might want to terminate the program by failing
      * should probably arrange to terminate the process themselves.
      */
-    Status runGlobalInitializers(const InitializerContext::ArgumentVector& args,
-                                 const InitializerContext::EnvironmentMap& env);
+    MONGO_CLIENT_API Status runGlobalInitializers(const InitializerContext::ArgumentVector& args,
+                                                  const InitializerContext::EnvironmentMap& env);
 
-    Status runGlobalInitializers(int argc, const char* const* argv, const char* const* envp);
+    MONGO_CLIENT_API Status runGlobalInitializers(
+            int argc, const char* const* argv, const char* const* envp);
 
     /**
      * Same as runGlobalInitializers(), except prints a brief message to std::cerr
      * and terminates the process on failure.
      */
-    void runGlobalInitializersOrDie(int argc, const char* const* argv, const char* const* envp);
+    MONGO_CLIENT_API void runGlobalInitializersOrDie(
+            int argc, const char* const* argv, const char* const* envp);
 
 }  // namespace mongo
diff --git a/src/mongo/base/status.h b/src/mongo/base/status.h
index d4d0ba0f9bf..275cb767e55 100644
--- a/src/mongo/base/status.h
+++ b/src/mongo/base/status.h
@@ -19,6 +19,7 @@
 #include <string>
 
 #include "mongo/base/error_codes.h"
+#include "mongo/client/export_macros.h"
 #include "mongo/platform/atomic_word.h"
 
 namespace mongo {
@@ -46,7 +47,7 @@ namespace mongo {
      * TODO: generate base/error_codes.h out of a description file
      * TODO: check 'location' duplicates against assert numbers
      */
-    class Status {
+    class MONGO_CLIENT_API Status {
     public:
         // Short-hand for returning an OK status.
         static inline Status OK();
@@ -128,16 +129,16 @@ namespace mongo {
         static inline void unref(ErrorInfo* error);
     };
 
-    inline bool operator==(const ErrorCodes::Error lhs, const Status& rhs);
+    MONGO_CLIENT_API inline bool operator==(const ErrorCodes::Error lhs, const Status& rhs);
 
-    inline bool operator!=(const ErrorCodes::Error lhs, const Status& rhs);
+    MONGO_CLIENT_API inline bool operator!=(const ErrorCodes::Error lhs, const Status& rhs);
 
     //
     // Convenience method for unittest code. Please use accessors otherwise.
     //
 
-    std::ostream& operator<<(std::ostream& os, const Status& status);
-    std::ostream& operator<<(std::ostream& os, ErrorCodes::Error);
+    MONGO_CLIENT_API std::ostream& operator<<(std::ostream& os, const Status& status);
+    MONGO_CLIENT_API std::ostream& operator<<(std::ostream& os, ErrorCodes::Error);
 
 }  // namespace mongo