[commit] r2029 - trunk/SDK/BON/Common

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Mon Aug 27 11:44:44 CDT 2012


Author: ksmyth
Date: Mon Aug 27 11:44:44 2012
New Revision: 2029

Log:
Revert "Dont require COCLASS_UUID_EXPLODED": doesnt work under Debug due to static initialization order problems. MSDN: In a debug build, __uuidof always initializes an object dynamically (at runtime). In a release build, __uuidof can statically (at compile time) initialize an object

Modified:
   trunk/SDK/BON/Common/ComponentObj.cpp

Modified: trunk/SDK/BON/Common/ComponentObj.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.cpp	Tue Aug 21 13:11:28 2012	(r2028)
+++ trunk/SDK/BON/Common/ComponentObj.cpp	Mon Aug 27 11:44:44 2012	(r2029)
@@ -352,17 +352,17 @@
 // CLSID_MGAComponentClass
 
 IMPLEMENT_OLECREATE(CComponentObj, COCLASS_PROGID, 
-						   __uuidof(CComponentObj).Data1,
-						   __uuidof(CComponentObj).Data2,
-						   __uuidof(CComponentObj).Data3,
-						   __uuidof(CComponentObj).Data4[0],
-						   __uuidof(CComponentObj).Data4[1],
-						   __uuidof(CComponentObj).Data4[2],
-						   __uuidof(CComponentObj).Data4[3],
-						   __uuidof(CComponentObj).Data4[4],
-						   __uuidof(CComponentObj).Data4[5],
-						   __uuidof(CComponentObj).Data4[6],
-						   __uuidof(CComponentObj).Data4[7])
+						   COCLASS_UUID_EXPLODED1,
+						   COCLASS_UUID_EXPLODED2,
+						   COCLASS_UUID_EXPLODED3,
+						   COCLASS_UUID_EXPLODED4,
+						   COCLASS_UUID_EXPLODED5,
+						   COCLASS_UUID_EXPLODED6,
+						   COCLASS_UUID_EXPLODED7,
+						   COCLASS_UUID_EXPLODED8,
+						   COCLASS_UUID_EXPLODED9,
+						   COCLASS_UUID_EXPLODED10,
+						   COCLASS_UUID_EXPLODED11)
 
 /////////////////////////////////////////////////////////////////////////////
 // CComponentObj::XInterface


More information about the gme-commit mailing list