overassert fixed

2 files changed, 10 insertions, 10 deletions

diff --git a/db/db.cpp b/db/db.cpp
index 16540eeeddc..5da883c5079 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -107,15 +107,6 @@ private:
 	const char *theEnd;

 };

 

-#pragma pack(push)

-#pragma pack(1)

-struct EmptyObject {

-	EmptyObject() { len = 5; jstype = EOO; }

-	int len;

-	char jstype;

-} emptyObject;

-#pragma pack(pop)

-

 void killCursors(int n, long long *ids);

 void receivedKillCursors(Message& m) {

 	int *x = (int *) m.data->_data;

diff --git a/db/query.cpp b/db/query.cpp
index 445cc1b3930..a397ea38afe 100644
--- a/db/query.cpp
+++ b/db/query.cpp
@@ -16,7 +16,16 @@ LRUishMap<JSObj,DiskLoc,5> lrutest(123);
 

 int nextCursorId = 1;

 

-JSObj emptyObj;

+#pragma pack(push)

+#pragma pack(1)

+struct EmptyObject {

+	EmptyObject() { len = 5; jstype = EOO; }

+	int len;

+	char jstype;

+} emptyObject;

+#pragma pack(pop)

+

+JSObj emptyObj((char *) &emptyObject);

 

 int getGtLtOp(Element& e);

 void appendElementHandlingGtLt(JSObjBuilder& b, Element& e);