minor cleanup pragmas

12 files changed, 14 insertions, 27 deletions

diff --git a/db/btree.h b/db/btree.h
index 9e3a6cf5ec5..3fd7f4511a7 100644
--- a/db/btree.h
+++ b/db/btree.h
@@ -23,8 +23,7 @@
 #include "storage.h"
 #include "pdfile.h"
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 struct _KeyNode {
 	DiskLoc prevChildBucket;
@@ -58,8 +57,7 @@ public:
 	JSObj key;
 };
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 /* this class is all about the storage management */
 class BucketBasics {
diff --git a/db/db.cpp b/db/db.cpp
index c203654a810..25dc66b64bb 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -646,7 +646,7 @@ void connThread()
 				ss << ' ' << t.millis() << "ms";
 				cout << ss.str().c_str() << endl;
 			}
-skip:
+//skip:
 			if( client && client->profile >= 1 ) { 
 				if( client->profile >= 2 || ms >= 100 ) { 
 					// profile it
diff --git a/db/dbclient.h b/db/dbclient.h
index 82354c2ae6a..5c25b1f5bfd 100644
--- a/db/dbclient.h
+++ b/db/dbclient.h
@@ -22,8 +22,7 @@
 

 class JSObj;

 

-#pragma pack(push)

-#pragma pack(1)
+#pragma pack(push,1)

 struct QueryResult : public MsgData {
 	long long cursorId;
 	int startingFrom;
diff --git a/db/jsobj.cpp b/db/jsobj.cpp
index 51b8336f01e..6d03a9577a3 100644
--- a/db/jsobj.cpp
+++ b/db/jsobj.cpp
@@ -803,8 +803,7 @@ int JSObj::addFields(JSObj& from, set<string>& fields) {
 
 /*-- test things ----------------------------------------------------*/
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 struct MaxKeyData { 
 	MaxKeyData() { totsize=7; maxkey=MaxKey; name=0; eoo=EOO; }
diff --git a/db/jsobj.h b/db/jsobj.h
index 74e39fc9f69..9356d935ad3 100644
--- a/db/jsobj.h
+++ b/db/jsobj.h
@@ -29,8 +29,7 @@ class JSObj;
 class Record;
 class JSObjBuilder;
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 /* BinData = binary data types. 
    EOO = end of object
@@ -533,8 +532,7 @@ extern JSObj maxKey;
 
 /*- just for testing -- */
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 struct JSObj1 {
 	JSObj1() {
 		totsize=sizeof(JSObj1); 
diff --git a/db/namespace.h b/db/namespace.h
index e5d3d200cf6..c843208a795 100644
--- a/db/namespace.h
+++ b/db/namespace.h
@@ -23,8 +23,7 @@
 
 class Cursor;
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 class Namespace {
 public:
diff --git a/db/pdfile.h b/db/pdfile.h
index 7f731a5b962..9447dabe08a 100644
--- a/db/pdfile.h
+++ b/db/pdfile.h
@@ -91,8 +91,7 @@ private:
 
 extern DataFileMgr theDataFileMgr;
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 class DeletedRecord {
 public:
diff --git a/db/query.cpp b/db/query.cpp
index 1d7c55e617d..1716d55dea0 100644
--- a/db/query.cpp
+++ b/db/query.cpp
@@ -40,8 +40,7 @@ LRUishMap<JSObj,DiskLoc,5> lrutest(123);
 int nextCursorId = 1;
 extern bool useCursors;
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 struct EmptyObject {
 	EmptyObject() { len = 5; jstype = EOO; }
 	int len;
diff --git a/db/repl.h b/db/repl.h
index cbfdb7c40b4..237ab5695b1 100644
--- a/db/repl.h
+++ b/db/repl.h
@@ -34,8 +34,7 @@ extern bool master;
 
 bool cloneFrom(const char *masterHost, string& errmsg);
 

-#pragma pack(push)

-#pragma pack(4)

+#pragma pack(push,4)

 class OpTime { 

       unsigned i;

       unsigned secs;

diff --git a/db/storage.h b/db/storage.h
index e1eea4cf287..ea2990088ec 100644
--- a/db/storage.h
+++ b/db/storage.h
@@ -22,8 +22,7 @@
 
 #pragma once
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 class Record;
 class DeletedRecord;
diff --git a/grid/protoimpl.h b/grid/protoimpl.h
index 8db57c05935..fc5b491b3de 100644
--- a/grid/protoimpl.h
+++ b/grid/protoimpl.h
@@ -31,8 +31,7 @@ const int FragMax = 1480;
 const int FragHeader = 10;
 const int MSS = FragMax - FragHeader;
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 struct Fragment {
 	enum { MinFragmentLen = FragHeader + 1 };
diff --git a/util/hashtab.h b/util/hashtab.h
index 6b94050f492..d5a90dfcb18 100644
--- a/util/hashtab.h
+++ b/util/hashtab.h
@@ -26,8 +26,7 @@
 #include "../stdafx.h"
 #include <map>
 
-#pragma pack(push)
-#pragma pack(1)
+#pragma pack(push,1)
 
 /* you should define: