Modify OID definition

2 files changed, 6 insertions, 3 deletions

diff --git a/db/jsobj.cpp b/db/jsobj.cpp
index dc8eb451d4f..a6b8781fd21 100644
--- a/db/jsobj.cpp
+++ b/db/jsobj.cpp
@@ -35,6 +35,7 @@
 BOOST_STATIC_ASSERT( sizeof(int) == 4 );
 BOOST_STATIC_ASSERT( sizeof(long long) == 8 );
 BOOST_STATIC_ASSERT( sizeof(double) == 8 );
+BOOST_STATIC_ASSERT( sizeof(mongo::OID) == 12 );
 
 namespace mongo {
 
diff --git a/db/jsobj.h b/db/jsobj.h
index 33ea7891e16..bcb0af42a8a 100644
--- a/db/jsobj.h
+++ b/db/jsobj.h
@@ -112,10 +112,12 @@ namespace mongo {
     */
     class OID {
         union {
-            long long a;
-            unsigned char data[8];
+            struct{
+                long long a;
+                unsigned b;
+            };
+            unsigned char data[12];
         };
-        unsigned b;
     public:
 		/** initialize to 'null' */
 		void clear() { a = 0; b = 0; }