CXX-277 Include windows headers where required

Author: acmorrow

src/mongo/bson/bsondemo/bsondemo.cpp

@@ -30,6 +30,13 @@
     Windows: project files are available in this directory for bsondemo.cpp for use with Visual Studio.
 */
 
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
 #include "mongo/client/dbclient.h"
 
 #include <iostream>

src/mongo/client/examples/arrayExample.cpp

@@ -13,11 +13,19 @@
  *    limitations under the License.
  */
 
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
+#include "mongo/bson/bson.h"
 
 #include <iostream>
 #include <list>
 #include <vector>
-#include "mongo/bson/bson.h"
+
 
 using mongo::BSONArray;
 using mongo::BSONArrayBuilder;

src/mongo/client/examples/authTest.cpp

@@ -15,11 +15,19 @@
  *    limitations under the License.
  */
 
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
+#include "mongo/client/dbclient.h"
+
 #include <boost/scoped_ptr.hpp>
 #include <iostream>
 #include <cstdlib>
 #include <string>
-#include "mongo/client/dbclient.h"
 
 using namespace mongo;
 

src/mongo/client/examples/clientTest.cpp

@@ -19,6 +19,13 @@
  * a simple test for the c++ driver
  */
 
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
 // this header should be first to ensure that it includes cleanly in any context
 #include "mongo/client/dbclient.h"
 

src/mongo/client/examples/first.cpp

@@ -19,11 +19,18 @@
  * this is a good first example of how to use mongo from c++
  */
 
-#include <iostream>
-#include <cstdlib>
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
 
 #include "mongo/client/dbclient.h"
 
+#include <iostream>
+#include <cstdlib>
+
 using namespace std;
 
 void insert( mongo::DBClientConnection & conn , const char * name , int num ) {

src/mongo/client/examples/httpClientTest.cpp

@@ -15,11 +15,18 @@
  *    limitations under the License.
  */
 
-#include <iostream>
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
 
 #include "mongo/client/dbclient.h"
 #include "mongo/util/net/httpclient.h"
 
+#include <iostream>
+
 #ifndef verify
 #  define verify(x) MONGO_verify(x)
 #endif

src/mongo/client/examples/insert_demo.cpp

@@ -13,9 +13,17 @@
  *    limitations under the License.
  */
 
-#include <iostream>
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
 #include "mongo/client/dbclient.h" // the mongo c++ driver
 
+#include <iostream>
+
 using namespace std;
 using namespace mongo;
 using namespace bson;

src/mongo/client/examples/rs.cpp

@@ -19,12 +19,19 @@
  * example of using replica sets from c++
  */
 
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
+#include "mongo/client/dbclient.h"
+
 #include <iostream>
 #include <vector>
 #include <boost/thread/thread.hpp>
 
-#include "mongo/client/dbclient.h"
-
 using namespace mongo;
 using namespace std;
 

src/mongo/client/examples/second.cpp

@@ -15,10 +15,17 @@
  *    limitations under the License.
  */
 
-#include <iostream>
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
 
 #include "mongo/client/dbclient.h"
 
+#include <iostream>
+
 using namespace std;
 using namespace mongo;
 

src/mongo/client/examples/simple_client_demo.cpp

@@ -15,9 +15,17 @@
 
 // See also : http://dochub.mongodb.org/core/cppdrivertutorial
 
-#include <iostream>
+// It is the responsibility of the mongo client consumer to ensure that any necessary windows
+// headers have already been included before including the driver facade headers.
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
 #include "mongo/client/dbclient.h" // the mongo c++ driver
 
+#include <iostream>
+
 using namespace std;
 using namespace mongo;
 using namespace bson;