SERVER-17736 Remove obsolete C++ driver symbol export miscellanea

1 files changed, 20 insertions, 21 deletions

diff --git a/src/mongo/client/sasl_client_authenticate.h b/src/mongo/client/sasl_client_authenticate.h
index e12649bee95..fe9e5918781 100644
--- a/src/mongo/client/sasl_client_authenticate.h
+++ b/src/mongo/client/sasl_client_authenticate.h
@@ -30,7 +30,6 @@
 #include "mongo/base/status.h"
 #include "mongo/bson/bsontypes.h"
 #include "mongo/client/dbclientinterface.h"
-#include "mongo/client/export_macros.h"
 
 namespace mongo {
     class BSONObj;
@@ -67,7 +66,7 @@ namespace mongo {
      * rejected.  Other failures, all of which are tantamount to authentication failure, may also be
      * returned.
      */
-    extern MONGO_CLIENT_API Status (*saslClientAuthenticate)(DBClientWithCommands* client,
+    extern Status (*saslClientAuthenticate)(DBClientWithCommands* client,
                                             const BSONObj& saslParameters);
 
     /**
@@ -79,69 +78,69 @@ namespace mongo {
      * stores into "*payload".  If the type is BinData, the contents are stored directly
      * into "*payload".  In all other cases, returns
      */
-    Status MONGO_CLIENT_API saslExtractPayload(const BSONObj& cmdObj, std::string* payload, BSONType* type);
+    Status saslExtractPayload(const BSONObj& cmdObj, std::string* payload, BSONType* type);
 
     // Constants
 
     /// std::string name of the saslStart command.
-    extern MONGO_CLIENT_API const char* const saslStartCommandName;
+    extern const char* const saslStartCommandName;
 
     /// std::string name of the saslContinue command.
-    extern MONGO_CLIENT_API const char* const saslContinueCommandName;
+    extern const char* const saslContinueCommandName;
 
     /// Name of the saslStart parameter indicating that the server should automatically grant the
     /// connection all privileges associated with the user after successful authentication.
-    extern MONGO_CLIENT_API const char* const saslCommandAutoAuthorizeFieldName;
+    extern const char* const saslCommandAutoAuthorizeFieldName;
 
     /// Name of the field contain the status code in responses from the server.
-    extern MONGO_CLIENT_API const char* const saslCommandCodeFieldName;
+    extern const char* const saslCommandCodeFieldName;
 
     /// Name of the field containing the conversation identifier in server respones and saslContinue
     /// commands.
-    extern MONGO_CLIENT_API const char* const saslCommandConversationIdFieldName;
+    extern const char* const saslCommandConversationIdFieldName;
 
     /// Name of the field that indicates whether or not the server believes authentication has
     /// completed successfully.
-    extern MONGO_CLIENT_API const char* const saslCommandDoneFieldName;
+    extern const char* const saslCommandDoneFieldName;
 
     /// Field in which  to store error messages associated with non-success return codes.
-    extern MONGO_CLIENT_API const char* const saslCommandErrmsgFieldName;
+    extern const char* const saslCommandErrmsgFieldName;
 
     /// Name of parameter to saslStart command indiciating the client's desired sasl mechanism.
-    extern MONGO_CLIENT_API const char* const saslCommandMechanismFieldName;
+    extern const char* const saslCommandMechanismFieldName;
 
     /// In the event that saslStart supplies an unsupported mechanism, the server responds with a
     /// field by this name, with a list of supported mechanisms.
-    extern MONGO_CLIENT_API const char* const saslCommandMechanismListFieldName;
+    extern const char* const saslCommandMechanismListFieldName;
 
     /// Field containing password information for saslClientAuthenticate().
-    extern MONGO_CLIENT_API const char* const saslCommandPasswordFieldName;
+    extern const char* const saslCommandPasswordFieldName;
 
     /// Field containing sasl payloads passed to and from the server.
-    extern MONGO_CLIENT_API const char* const saslCommandPayloadFieldName;
+    extern const char* const saslCommandPayloadFieldName;
 
     /// Field containing the std::string identifier of the user to authenticate in
     /// saslClientAuthenticate().
-    extern MONGO_CLIENT_API const char* const saslCommandUserFieldName;
+    extern const char* const saslCommandUserFieldName;
 
     /// Field containing the std::string identifier of the database containing credential information,
     /// or "$external" if the credential information is stored outside of the mongo cluster.
-    extern MONGO_CLIENT_API const char* const saslCommandUserDBFieldName;
+    extern const char* const saslCommandUserDBFieldName;
 
     /// Field overriding the FQDN of the hostname hosting the mongodb srevice in
     /// saslClientAuthenticate().
-    extern MONGO_CLIENT_API const char* const saslCommandServiceHostnameFieldName;
+    extern const char* const saslCommandServiceHostnameFieldName;
 
     /// Field overriding the name of the mongodb service saslClientAuthenticate().
-    extern MONGO_CLIENT_API const char* const saslCommandServiceNameFieldName;
+    extern const char* const saslCommandServiceNameFieldName;
 
     /// Default database against which sasl authentication commands should run.
-    extern MONGO_CLIENT_API const char* const saslDefaultDBName;
+    extern const char* const saslDefaultDBName;
 
     /// Default sasl service name, "mongodb".
-    extern MONGO_CLIENT_API const char* const saslDefaultServiceName;
+    extern const char* const saslDefaultServiceName;
 
     // Field whose value should be set to true if the field in saslCommandPasswordFieldName needs to
     // be digested.
-    extern MONGO_CLIENT_API const char* const saslCommandDigestPasswordFieldName;
+    extern const char* const saslCommandDigestPasswordFieldName;
 }