[commit] r2323 - trunk/GME/Meta

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Aug 30 10:09:00 2013
New Revision: 2323

Log:
Need to qualify GUID in MgaMetaProject with #import

Modified:
   trunk/GME/Meta/CoreMetaDefines.cpp
   trunk/GME/Meta/MgaMetaProject.cpp

Modified: trunk/GME/Meta/CoreMetaDefines.cpp
==============================================================================
--- trunk/GME/Meta/CoreMetaDefines.cpp	Fri Aug 30 09:07:06 2013	(r2322)
+++ trunk/GME/Meta/CoreMetaDefines.cpp	Fri Aug 30 10:09:00 2013	(r2323)
@@ -10,7 +10,7 @@
 	COMTHROW( project->put_Token(PutInBstr("MgaMetaProject")) );
 	COMTHROW( project->put_Name(PutInBstr("MgaMetaProject")) );
 
-	GUID guid = {0x028F7AA4,0x2E51,0x11D3,{0xB3,0x17,0x00,0x62,0x08,0x2D,0xF8,0x85}};
+	::GUID guid = {0x028F7AA4,0x2E51,0x11D3,{0xB3,0x17,0x00,0x62,0x08,0x2D,0xF8,0x85}};
 	COMTHROW( project->put_GUID(PutInVariant(guid)) );
 
 // ------- Macros

Modified: trunk/GME/Meta/MgaMetaProject.cpp
==============================================================================
--- trunk/GME/Meta/MgaMetaProject.cpp	Fri Aug 30 09:07:06 2013	(r2322)
+++ trunk/GME/Meta/MgaMetaProject.cpp	Fri Aug 30 10:09:00 2013	(r2323)
@@ -240,10 +240,10 @@
 		CCoreObjectPtr me(rootobject);
 		me.GetVariantValue(ATTRID_GUID, p);
 
-		if( p->vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(*p) != sizeof(GUID) )
+		if( p->vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(*p) != sizeof(::GUID) )
 		{
 			::GUID guid;
-			memset(&guid, 0, sizeof(GUID));
+			memset(&guid, 0, sizeof(::GUID));
 
 			CopyTo(guid, p);
 		}
@@ -256,7 +256,7 @@
 	if( rootobject == NULL )
 		COMRETURN(E_META_NOTOPEN);
 
-	if( p.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(p) != sizeof(GUID) )
+	if( p.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(p) != sizeof(::GUID) )
 		COMRETURN(E_INVALIDARG);
 
 	return ComPutAttrValue(rootobject, ATTRID_GUID, p);