CXX-376 Strip MONGO_CLIENT_(FUNC|API) macros from non-exported headers

Author: amidvidy

src/mongo/base/initializer.h

@@ -34,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 MONGO_CLIENT_API Initializer {
+    class Initializer {
         MONGO_DISALLOW_COPYING(Initializer);
     public:
         Initializer();
@@ -68,18 +68,18 @@ 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.
      */
-    MONGO_CLIENT_API Status MONGO_CLIENT_FUNC runGlobalInitializers(
+    Status runGlobalInitializers(
         const InitializerContext::ArgumentVector& args,
         const InitializerContext::EnvironmentMap& env);
 
-    MONGO_CLIENT_API Status MONGO_CLIENT_FUNC runGlobalInitializers(
+    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.
      */
-    MONGO_CLIENT_API void MONGO_CLIENT_FUNC runGlobalInitializersOrDie(
+    void runGlobalInitializersOrDie(
             int argc, const char* const* argv, const char* const* envp);
 
 }  // namespace mongo

src/mongo/client/cyrus_sasl_client_session.h

@@ -23,7 +23,7 @@ namespace mongo {
      * Implementation of the client side of a SASL authentication conversation.
      * using the Cyrus SASL library.
      */
-    class MONGO_CLIENT_API CyrusSaslClientSession : public SaslClientSession {
+    class CyrusSaslClientSession : public SaslClientSession {
         MONGO_DISALLOW_COPYING(CyrusSaslClientSession);
     public:
 

src/mongo/client/dbclientmockcursor.h

@@ -22,7 +22,7 @@
 
 namespace mongo {
 
-    class MONGO_CLIENT_API DBClientMockCursor : public DBClientCursorInterface {
+    class DBClientMockCursor : public DBClientCursorInterface {
     public:
         DBClientMockCursor( const BSONArray& mockCollection ) : _iter( mockCollection ) {}
         virtual ~DBClientMockCursor() {}

src/mongo/client/native_sasl_client_session.h

@@ -25,7 +25,7 @@ namespace mongo {
      * Implementation of the client side of a SASL authentication conversation using the
      * native SASL implementation.
      */
-    class MONGO_CLIENT_API NativeSaslClientSession : public SaslClientSession {
+    class NativeSaslClientSession : public SaslClientSession {
         MONGO_DISALLOW_COPYING(NativeSaslClientSession);
     public:
 

src/mongo/client/replica_set_monitor.h

@@ -35,7 +35,7 @@ namespace mongo {
      * Holds state about a replica set and provides a means to refresh the local view.
      * All methods perform the required synchronization to allow callers from multiple threads.
      */
-    class MONGO_CLIENT_API ReplicaSetMonitor {
+    class ReplicaSetMonitor {
         MONGO_DISALLOW_COPYING(ReplicaSetMonitor);
     public:
         class Refresher;
@@ -126,26 +126,26 @@ namespace mongo {
         /**
          * Creates a new ReplicaSetMonitor, if it doesn't already exist.
          */
-        static void MONGO_CLIENT_FUNC createIfNeeded(const std::string& name , const std::set<HostAndPort>& servers);
+        static void createIfNeeded(const std::string& name , const std::set<HostAndPort>& servers);
 
         /**
          * gets a cached Monitor per name. If the monitor is not found and createFromSeed is false,
          * it will return none. If createFromSeed is true, it will try to look up the last known
          * servers list for this set and will create a new monitor using that as the seed list.
          */
-        static ReplicaSetMonitorPtr MONGO_CLIENT_FUNC get(const std::string& name, bool createFromSeed = false);
+        static ReplicaSetMonitorPtr get(const std::string& name, bool createFromSeed = false);
 
         /**
          * Returns all the currently tracked replica set names.
          */
-        static std::set<std::string> MONGO_CLIENT_FUNC getAllTrackedSets();
+        static std::set<std::string> getAllTrackedSets();
 
         /**
          * Removes the ReplicaSetMonitor for the given set name from _sets, which will delete it.
          * If clearSeedCache is true, then the cached seed string for this Replica Set will be
          * removed from _seedServers.
          */
-        static void MONGO_CLIENT_FUNC remove(const std::string& name, bool clearSeedCache = false);
+        static void remove(const std::string& name, bool clearSeedCache = false);
 
         /**
          * Sets the hook to be called whenever the config of any replica set changes.
@@ -156,15 +156,15 @@ namespace mongo {
          *
          * The hook must not be changed while the program has multiple threads.
          */
-        static void MONGO_CLIENT_FUNC setConfigChangeHook(ConfigChangeHook hook);
+        static void setConfigChangeHook(ConfigChangeHook hook);
 
         /**
          * Starts the ReplicaSetMonitorWatcher. You shouldn't have to call this in production code
          * as it is called in init.cpp. However, it may be useful to pair calls to initalize
          * and cleanup in tests. The behavior of other methods in this class is undefined if initialize()
          * has not been called.
          */
-        static Status MONGO_CLIENT_FUNC initialize();
+        static Status initialize();
 
         /**
          * Permanently stops all monitoring on replica sets and clears all cached information
@@ -176,7 +176,7 @@ namespace mongo {
          * of 0 (the default) indicates no timeout. If a nonzero timeout is specified, a return value
          * of Status::OK() indicates that shutdown completed successfully in the allotted time.
          */
-        static Status MONGO_CLIENT_FUNC shutdown(int gracePeriodMillis = 0);
+        static Status shutdown(int gracePeriodMillis = 0);
 
         /**
          * If a ReplicaSetMonitor has been refreshed more than this many times in a row without
@@ -228,7 +228,7 @@ namespace mongo {
      * All logic related to choosing the hosts to contact and updating the SetState based on replies
      * lives in this class.
      */
-    class MONGO_CLIENT_API ReplicaSetMonitor::Refresher {
+    class ReplicaSetMonitor::Refresher {
     public:
         /**
          * Contact hosts in the set to refresh our view, but stop once a host matches criteria.
@@ -303,7 +303,7 @@ namespace mongo {
         /**
          * Starts a new scan over the hosts in set.
          */
-        static ScanStatePtr MONGO_CLIENT_FUNC startNewScan(const SetState* set);
+        static ScanStatePtr startNewScan(const SetState* set);
 
     private:
         /**

src/mongo/client/sasl_client_session.h

@@ -39,7 +39,7 @@ namespace mongo {
      * parameters must be UTF-8 encoded strings with no embedded NUL characters.  The
      * parameterPassword parameter is not constrained.
      */
-    class MONGO_CLIENT_API SaslClientSession {
+    class SaslClientSession {
         MONGO_DISALLOW_COPYING(SaslClientSession);
     public:
         typedef stdx::function<SaslClientSession* (const std::string&)> SaslClientSessionFactoryFn;

src/mongo/util/timer.h

@@ -32,7 +32,7 @@ namespace mongo {
      * 2.5 years will be supported.  Since a typical tick duration will be under 10 per nanosecond,
      * if not below 1 per nanosecond, this should not be an issue.
      */
-    class MONGO_CLIENT_API Timer /*copyable*/ {
+    class Timer /*copyable*/ {
     public:
         static const long long millisPerSecond = 1000;
         static const long long microsPerSecond = 1000 * millisPerSecond;