[commit] r1773 - in trunk/SDK/BON: Common Wizard/Templates/1033
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Jan 4 17:54:38 CST 2012
Author: ksmyth
Date: Wed Jan 4 17:54:38 2012
New Revision: 1773
Log:
Refactor to allow to compiling cpps (except ComponentObj) without ComponentConfig.h or ComponentLib.h. Enables compiling .lib for solutions with many GME interpreters
Modified:
trunk/SDK/BON/Common/BON.h
trunk/SDK/BON/Common/BONImpl.cpp
trunk/SDK/BON/Common/Builder.h
trunk/SDK/BON/Common/ComHelp.cpp
trunk/SDK/BON/Common/ComponentDll.cpp
trunk/SDK/BON/Common/ComponentDll.h
trunk/SDK/BON/Common/ComponentObj.cpp
trunk/SDK/BON/Common/ComponentObj.h
trunk/SDK/BON/Common/Extensions.cpp
trunk/SDK/BON/Common/GMECOM.H
trunk/SDK/BON/Common/MONImpl.h
trunk/SDK/BON/Wizard/Templates/1033/StdAfx.h
Modified: trunk/SDK/BON/Common/BON.h
==============================================================================
--- trunk/SDK/BON/Common/BON.h Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/BON.h Wed Jan 4 17:54:38 2012 (r1773)
@@ -23,8 +23,7 @@
#define BON_h
#include "Utils.h"
-#include "ComponentLib.h"
-#include "gme.h"
+#include "GME.h"
#include "Common.h"
#include "MON.h"
Modified: trunk/SDK/BON/Common/BONImpl.cpp
==============================================================================
--- trunk/SDK/BON/Common/BONImpl.cpp Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/BONImpl.cpp Wed Jan 4 17:54:38 2012 (r1773)
@@ -22,10 +22,11 @@
#include "stdafx.h"
#include "BONImpl.h"
#include "Extensions.h"
-#include <ComponentConfig.h>
// Utils.h uses COMTHROW but doesn't define it
#define COMTHROW(x) BONCOMTHROW(x)
+extern const bool g_GME_ADDON;
+extern const bool g_TEST_META_CONFORMANCE_INSIDE_BON;
#ifndef NAMESPACE_PREF
#define NAMESPACE_PREF ""
@@ -80,19 +81,13 @@
inline void _checkIsCallable( ObjectImpl* pObject )
{
- #ifdef GME_ADDON
- if ( pObject->getStatus() != OST_Exists )
- ASSERTTHROW( Exception( "Object is already deleted. Operation is illegal!" ) );
- #endif
+ if (g_GME_ADDON && pObject->getStatus() != OST_Exists )
+ ASSERTTHROW( Exception( "Object is already deleted. Operation is illegal!" ) );
}
inline bool _isAddOn()
{
- #ifdef GME_ADDON
- return true;
- #else
- return false;
- #endif
+ return g_GME_ADDON;
}
template < class T >
@@ -2643,12 +2638,13 @@
MON::Connection meta;
if ( ! strConnection.empty() ) {
meta = MON::Connection( getProject()->getProjectMeta().findByName( strConnection ) );
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
- THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
-#else
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
+ THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
+ }
+ else
if( !meta)
return std::set<Connection>();
-#endif
}
return getConnLinks( meta, strRole, bAsFCO, aspect );
}
@@ -2716,7 +2712,8 @@
}
if ( ! bFound )
{
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
if ( strRole.empty() ) {
MON::Exception exc( "? cannot be target of ?!");
exc << getFCOHelper()->getObjectMeta().infoString() << meta.infoString();
@@ -2727,9 +2724,11 @@
exc << getFCOHelper()->getObjectMeta().infoString() << meta.infoString() << strRole;
ASSERTTHROW( exc);
}
-#else
+ }
+ else
+ {
return std::multiset<ConnectionEnd>();
-#endif
+ }
}
specs = meta.specifications();
@@ -2811,12 +2810,15 @@
MON::Connection meta;
if ( ! strConnection.empty() ) {
meta = MON::Connection( getProject()->getProjectMeta().findByName( strConnection ) );
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
-#else
+ }
+ else
+ {
if( !meta)
return std::multiset<ConnectionEnd>();
-#endif
+ }
}
return getConnEndsAs( meta, strRole, bAsFCO, aspect );
}
@@ -2944,13 +2946,16 @@
}
if ( ! bFound )
{
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
MON::Exception exc( "? cannot be target of ?!");
exc << getFCOHelper()->getObjectMeta().infoString() << meta.infoString();
ASSERTTHROW( exc);
-#else
+ }
+ else
+ {
return std::multiset<ConnectionEnd>();
-#endif
+ }
}
specs = meta.specifications();
@@ -3042,12 +3047,15 @@
MON::Connection meta;
if ( ! strConnection.empty() ) {
meta = MON::Connection( getProject()->getProjectMeta().findByName( strConnection ) );
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
THROW_METAPROJECT_DOES_NOT_HAVE( meta, Connection, strConnection );
-#else
+ }
+ else
+ {
if( !meta)
return std::multiset<ConnectionEnd>();
-#endif
+ }
}
return getConnEnds( meta, strRole, bAsFCO, aspect );
}
@@ -6154,15 +6162,12 @@
if ( meta ) {
THROW_METAPROJECT_BELONG( meta );
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
- if ( ! getReferenceMeta().isReferenced( meta ) )
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON && !getReferenceMeta().isReferenced(meta))
{
MON::Exception exc( "? cannot be referenced by ?!");
exc << meta.infoString() << getObjectMeta().infoString();
ASSERTTHROW( exc);
}
-#endif
-
}
return getReferredFCOI( meta );
}
@@ -6182,7 +6187,8 @@
if ( fco ) {
THROW_PROJECT_BELONG( fco );
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
// added by ZolMol
MON::FCO meta = fco->getFCOMeta();
if ( ! getReferenceMeta().isReferenced( meta ) )
@@ -6212,7 +6218,7 @@
ASSERTTHROW( MON::Exception( "? cannot be referenced by ?!", "ss", fco->getObjectMeta().infoString().c_str(), getObjectMeta().infoString().c_str() ) );
} end commended part*/
// CHANGED LINES END
-#endif
+ }
}
if ( ! _isAddOn() ) {
if ( m_referredFCO.second )
@@ -6581,8 +6587,8 @@
ASSERTTHROW( exc);
}
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
-
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
bool bOK = false;
for ( int i = 0 ; i < MON::Connection( meta.child() ).specificationCount() && ! bOK ; i++ ) {
bOK = true;
@@ -6609,7 +6615,7 @@
ASSERTTHROW( MON::Exception( strEx, vecParams ) );
}
-#endif
+ }
FCOPtr spFCO;
COMCHECK2( parent->getModelI(), parent->getModelI()->CreateSimpleConn( meta.getContainmentI(), mapEnds[ "src" ]->getFCOI(), mapEnds[ "dst" ]->getFCOI(), mapRefSeqs[ "src" ], mapRefSeqs[ "dst" ], spFCO.Addr() ) );
@@ -6722,8 +6728,8 @@
if ( meta )
THROW_METAPROJECT_BELONG( meta );
-#ifdef TEST_META_CONFORMANCE_INSIDE_BON
-
+ if (g_TEST_META_CONFORMANCE_INSIDE_BON)
+ {
bool bRoleFound = false;
bool bFound = false;
for ( int i = 0 ; i < getConnectionMeta().specificationCount() ; i++ ) {
@@ -6754,7 +6760,7 @@
ASSERTTHROW( exc);
}
-#endif
+ }
return getConnectionEndI( strRole, meta );
}
Modified: trunk/SDK/BON/Common/Builder.h
==============================================================================
--- trunk/SDK/BON/Common/Builder.h Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/Builder.h Wed Jan 4 17:54:38 2012 (r1773)
@@ -1,13 +1,3 @@
-/////////////////////////////////////////////////
-// GME v0.5 Alpha Release //
-// Copyright (c) 1998, Vanderbilt University //
-// All Rights Reserved //
-/////////////////////////////////////////////////
-
-#ifndef BUILDER_OBJECT_NETWORK
-#error This file should only be included in the BON configurations
-#endif
-
#define BUILDER_CAST(CLASS,PTR) (DYNAMIC_DOWNCAST(CLASS,PTR))
#ifndef GME_BUILDER_H
Modified: trunk/SDK/BON/Common/ComHelp.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComHelp.cpp Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/ComHelp.cpp Wed Jan 4 17:54:38 2012 (r1773)
@@ -1,19 +1,17 @@
#include "StdAfx.h"
#include "Comdef.h"
-#include "ComponentConfig.h"
+
+extern const wchar_t* g_COCLASS_PROGIDW;
void SetErrorInfo(HRESULT hr, const wchar_t* err)
{
ICreateErrorInfoPtr errCreate;
if (SUCCEEDED(CreateErrorInfo(&errCreate))
&& SUCCEEDED(errCreate->SetDescription(const_cast<wchar_t*>(err)))
-#define __OLESTR(x) L ## x
-#define _OLESTR(x) __OLESTR(x)
- && SUCCEEDED(errCreate->SetSource(_OLESTR(COCLASS_PROGID)))
+ && SUCCEEDED(errCreate->SetSource(const_cast<wchar_t*>(g_COCLASS_PROGIDW)))
)
{
-
IErrorInfoPtr errorInfo = errCreate;
SetErrorInfo(0, errorInfo);
}
Modified: trunk/SDK/BON/Common/ComponentDll.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentDll.cpp Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/ComponentDll.cpp Wed Jan 4 17:54:38 2012 (r1773)
@@ -4,9 +4,11 @@
#include "stdafx.h"
//#include <afxctl.h>
+#include "MgaUtil.h"
#include "ComponentDll.h"
-#include "ComponentObj.h"
-#include "ComponentConfig.h"
+
+extern bool const g_REGISTER_SYSTEMWIDE;
+extern const char* g_COMPONENT_NAME;
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -54,7 +56,7 @@
/////////////////////////////////////////////////////////////////////////////
// CComponentApp construction
-CComponentApp::CComponentApp() : CWinApp(COMPONENT_NAME)
+CComponentApp::CComponentApp() : CWinApp(g_COMPONENT_NAME)
{
// TODO: add construction code here,
// Place all significant initialization in InitInstance
@@ -151,16 +153,14 @@
// or from the resources. But the resource ID of the
// TYPELIB must be 1 !!!
/*
- if( !AfxOleRegisterTypeLib(AfxGetInstanceHandle(),
- LIBID_MgaComponentLib, NULL) )
+ if( !AfxOleRegisterTypeLib(AfxGetInstanceHandle(), LIBID_MgaComponentLib, NULL) )
return E_FAIL;
*/
CComponentReg reg;
-#ifdef REGISTER_SYSTEMWIDE
- COMRETURN( reg.RegisterParadigms(REGACCESS_SYSTEM));
-#else
- COMRETURN( reg.RegisterParadigms());
-#endif
+ if (g_REGISTER_SYSTEMWIDE)
+ COMRETURN(reg.RegisterParadigms(REGACCESS_SYSTEM))
+ else
+ COMRETURN(reg.RegisterParadigms())
return S_OK;
@@ -178,11 +178,10 @@
return SELFREG_E_CLASS;
CComponentReg reg;
-#ifdef REGISTER_SYSTEMWIDE
- COMRETURN( reg.UnregisterParadigms(REGACCESS_SYSTEM));
-#else
- COMRETURN( reg.UnregisterParadigms());
-#endif
+ if (g_REGISTER_SYSTEMWIDE)
+ COMRETURN(reg.UnregisterParadigms(REGACCESS_SYSTEM))
+ else
+ COMRETURN(reg.UnregisterParadigms())
return S_OK;
}
Modified: trunk/SDK/BON/Common/ComponentDll.h
==============================================================================
--- trunk/SDK/BON/Common/ComponentDll.h Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/ComponentDll.h Wed Jan 4 17:54:38 2012 (r1773)
@@ -7,7 +7,6 @@
#error include 'stdafx.h' before including this file for PCH
#endif
-#include "resource.h" // main symbols
/////////////////////////////////////////////////////////////////////////////
// CComponentApp
@@ -38,3 +37,127 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+
+
+class CUACUtils
+{
+public:
+
+ // Vista-dependent icon constants (copied from Commctrl.h)
+#ifndef BCM_FIRST
+ static const DWORD BCM_FIRST = 0x1600;
+#endif
+#ifndef BCM_SETSHIELD
+ static const DWORD BCM_SETSHIELD = (BCM_FIRST + 0x000C);
+#endif
+
+ static bool isVistaOrLater()
+ {
+ OSVERSIONINFO osvi;
+
+ ::ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+
+ GetVersionEx(&osvi);
+
+ return (osvi.dwMajorVersion >= 6);
+ }
+
+ static bool isElevated()
+ {
+ if ( !isVistaOrLater() ) {
+ return true;
+ }
+
+ HANDLE hToken = NULL;
+
+ if ( !::OpenProcessToken(
+ ::GetCurrentProcess(),
+ TOKEN_QUERY,
+ &hToken ) )
+ {
+ return false;
+ }
+
+ DWORD dwReturnLength = 0;
+ TOKEN_ELEVATION te;
+ ::ZeroMemory(&te, sizeof(te));
+
+ if ( ::GetTokenInformation(
+ hToken,
+ TokenElevation,
+ &te,
+ sizeof(te),
+ &dwReturnLength ) )
+ {
+ ASSERT( dwReturnLength == sizeof( te ) );
+ return (te.TokenIsElevated != 0);
+ }
+
+ ::CloseHandle( hToken );
+
+ return false;
+ }
+
+ template <typename T>
+ static HRESULT CreateElevatedInstance(LPCOLESTR progId,
+ T** object, HWND window = 0)
+ {
+ CLSID clsId;
+ HRESULT hr = ::CLSIDFromProgID(progId, &clsId);
+ if (FAILED(hr)) {
+ return hr;
+ }
+
+ return CreateElevatedInstance(clsId, object, window);
+ }
+
+ template <typename T>
+ static HRESULT CreateElevatedInstance(REFCLSID classId,
+ T** object, HWND window = 0)
+ {
+ BIND_OPTS3 bindOptions;
+ gettokeninformation
+ ::ZeroMemory(&bindOptions, sizeof (BIND_OPTS3));
+ bindOptions.cbStruct = sizeof (BIND_OPTS3);
+ bindOptions.hwnd = window;
+ bindOptions.dwClassContext = CLSCTX_LOCAL_SERVER;
+
+ WCHAR wszMonikerName[300];
+ WCHAR wszCLSID[50];
+
+ #define cntof(a) (sizeof(a)/sizeof(a[0]))
+
+ ::StringFromGUID2(classId, wszCLSID,
+ cntof(wszCLSID));
+
+ HRESULT hr = ::StringCchPrintfW(wszMonikerName, cntof(wszMonikerName), L"Elevation:Administrator!new:%s", wszCLSID);
+
+ if (FAILED(hr))
+ {
+ return hr;
+ }
+
+ return ::CoGetObject(wszMonikerName,
+ &bindOptions,
+ __uuidof(T),
+ reinterpret_cast<void**>(object));
+ }
+
+ static void SetShieldIcon(const CButton& button, bool on=true)
+ {
+ button.SendMessage(BCM_SETSHIELD, 0, on ? TRUE : FALSE);
+ }
+};
+
+
+class CComponentReg
+{
+public:
+ CComponentReg();
+
+ CStringList paradigms;
+ HRESULT RegisterParadigms(regaccessmode_enum loc = REGACCESS_USER);
+ HRESULT UnregisterParadigms(regaccessmode_enum loc = REGACCESS_USER);
+};
Modified: trunk/SDK/BON/Common/ComponentObj.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.cpp Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/ComponentObj.cpp Wed Jan 4 17:54:38 2012 (r1773)
@@ -45,8 +45,39 @@
#include "stdafx.h"
+#include "MgaUtil.h"
+#include "ComponentConfig.h"
+
#include "GMECOM.h"
+#include "ComponentDll.h"
+#include "ComponentObj.h"
+
+#define _OLESTR(x) OLESTR(x)
+extern const char* g_COCLASS_PROGID = COCLASS_PROGID;
+extern const wchar_t* g_COCLASS_PROGIDW = _OLESTR(COCLASS_PROGID);
+extern const char* g_COMPONENT_NAME = COMPONENT_NAME;
+extern const wchar_t* g_COMPONENT_NAMEW = _OLESTR(COMPONENT_NAME);
+#ifdef REGISTER_SYSTEMWIDE
+extern const bool g_REGISTER_SYSTEMWIDE = true;
+#else
+extern const bool g_REGISTER_SYSTEMWIDE = false;
+#endif
+#ifdef GME_ADDON
+extern const bool g_GME_ADDON = true;
+#else
+extern const bool g_GME_ADDON = false;
+#endif
+#ifdef TEST_META_CONFORMANCE_INSIDE_BON
+extern const bool g_TEST_META_CONFORMANCE_INSIDE_BON = true;
+#else
+extern const bool g_TEST_META_CONFORMANCE_INSIDE_BON = false;
+#endif
+
+#include "Core_i.c"
+#include "Mga_i.c"
+#include "ComponentLib_i.c"
+
#ifdef BUILDER_OBJECT_NETWORK
#include "Mga.h"
#include <BONComponent.h>
@@ -57,8 +88,6 @@
#include "ComponentLib.h"
-#include <ComponentConfig.h>
-
#include "ComponentObj.h"
#include "Console.h"
@@ -66,9 +95,6 @@
#include "Gme.h"
-#include "ComponentLib_i.c"
-#include "Core_i.c"
-#include "Mga_i.c"
#ifdef _DEBUG
Modified: trunk/SDK/BON/Common/ComponentObj.h
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.h Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/ComponentObj.h Wed Jan 4 17:54:38 2012 (r1773)
@@ -3,7 +3,6 @@
#include "ComHelp.h"
#include "GMECOM.h"
-#include <ComponentConfig.h>
#include "Exceptions.h"
#include "MgaUtil.h"
#include "Core.h"
@@ -209,129 +208,6 @@
#endif // __AFXPRIV_H__
-
-class CUACUtils
-{
-public:
-
- // Vista-dependent icon constants (copied from Commctrl.h)
-#ifndef BCM_FIRST
- static const DWORD BCM_FIRST = 0x1600;
-#endif
-#ifndef BCM_SETSHIELD
- static const DWORD BCM_SETSHIELD = (BCM_FIRST + 0x000C);
-#endif
-
- static bool isVistaOrLater()
- {
- OSVERSIONINFO osvi;
-
- ::ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
- GetVersionEx(&osvi);
-
- return (osvi.dwMajorVersion >= 6);
- }
-
- static bool isElevated()
- {
- if ( !isVistaOrLater() ) {
- return true;
- }
-
- HANDLE hToken = NULL;
-
- if ( !::OpenProcessToken(
- ::GetCurrentProcess(),
- TOKEN_QUERY,
- &hToken ) )
- {
- return false;
- }
-
- DWORD dwReturnLength = 0;
- TOKEN_ELEVATION te;
- ::ZeroMemory(&te, sizeof(te));
-
- if ( ::GetTokenInformation(
- hToken,
- TokenElevation,
- &te,
- sizeof(te),
- &dwReturnLength ) )
- {
- ASSERT( dwReturnLength == sizeof( te ) );
- return (te.TokenIsElevated != 0);
- }
-
- ::CloseHandle( hToken );
-
- return false;
- }
-
- template <typename T>
- static HRESULT CreateElevatedInstance(LPCOLESTR progId,
- T** object, HWND window = 0)
- {
- CLSID clsId;
- HRESULT hr = ::CLSIDFromProgID(progId, &clsId);
- if (FAILED(hr)) {
- return hr;
- }
-
- return CreateElevatedInstance(clsId, object, window);
- }
-
- template <typename T>
- static HRESULT CreateElevatedInstance(REFCLSID classId,
- T** object, HWND window = 0)
- {
- BIND_OPTS3 bindOptions;
- gettokeninformation
- ::ZeroMemory(&bindOptions, sizeof (BIND_OPTS3));
- bindOptions.cbStruct = sizeof (BIND_OPTS3);
- bindOptions.hwnd = window;
- bindOptions.dwClassContext = CLSCTX_LOCAL_SERVER;
-
- WCHAR wszMonikerName[300];
- WCHAR wszCLSID[50];
-
- #define cntof(a) (sizeof(a)/sizeof(a[0]))
-
- ::StringFromGUID2(classId, wszCLSID,
- cntof(wszCLSID));
-
- HRESULT hr = ::StringCchPrintfW(wszMonikerName, cntof(wszMonikerName), L"Elevation:Administrator!new:%s", wszCLSID);
-
- if (FAILED(hr))
- {
- return hr;
- }
-
- return ::CoGetObject(wszMonikerName,
- &bindOptions,
- __uuidof(T),
- reinterpret_cast<void**>(object));
- }
-
- static void SetShieldIcon(const CButton& button, bool on=true)
- {
- button.SendMessage(BCM_SETSHIELD, 0, on ? TRUE : FALSE);
- }
-};
-
-
-class CComponentReg
-{
-public:
- CComponentReg();
-
- CStringList paradigms;
- HRESULT RegisterParadigms(regaccessmode_enum loc = REGACCESS_USER);
- HRESULT UnregisterParadigms(regaccessmode_enum loc = REGACCESS_USER);
-};
-
/////////////////////////////////////////////////////////////////////////////
//{{AFX_INSERT_LOCATION}}
Modified: trunk/SDK/BON/Common/Extensions.cpp
==============================================================================
--- trunk/SDK/BON/Common/Extensions.cpp Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/Extensions.cpp Wed Jan 4 17:54:38 2012 (r1773)
@@ -24,7 +24,6 @@
#include "stdafx.h"
#include "BONImpl.h"
-#include "Bon2component.h"
#include "Extensions.h"
Modified: trunk/SDK/BON/Common/GMECOM.H
==============================================================================
--- trunk/SDK/BON/Common/GMECOM.H Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/GMECOM.H Wed Jan 4 17:54:38 2012 (r1773)
@@ -1,6 +1,4 @@
-#ifndef GMECOM_H
-#define GMECOM_H
-
+#pragma once
#include "Comdef.h"
@@ -60,4 +58,3 @@
// Defined in ComHelp.cpp
void SetErrorInfo(HRESULT hr, const wchar_t* err);
-#endif // GMECOM_H
Modified: trunk/SDK/BON/Common/MONImpl.h
==============================================================================
--- trunk/SDK/BON/Common/MONImpl.h Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Common/MONImpl.h Wed Jan 4 17:54:38 2012 (r1773)
@@ -29,7 +29,7 @@
#include <map>
#include <set>
#include <vector>
-#include "ComponentLib.h"
+#include "Meta.h"
#include "Utils.h"
#include "Common.h"
Modified: trunk/SDK/BON/Wizard/Templates/1033/StdAfx.h
==============================================================================
--- trunk/SDK/BON/Wizard/Templates/1033/StdAfx.h Wed Jan 4 14:36:23 2012 (r1772)
+++ trunk/SDK/BON/Wizard/Templates/1033/StdAfx.h Wed Jan 4 17:54:38 2012 (r1773)
@@ -1,16 +1,13 @@
// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
+// or project specific include files that are used often,
// but are changed infrequently
-#if !defined(AFX_STDAFX_H__C4EFDDFC_C095_4509_B571_632F0986D162__INCLUDED_)
-#define AFX_STDAFX_H__C4EFDDFC_C095_4509_B571_632F0986D162__INCLUDED_
-
#pragma once
-#define TEST_META_CONFORMANCE_INSIDE_BON // by ZolMol
+#define TEST_META_CONFORMANCE_INSIDE_BON
#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#endif
#include "targetver.h"
@@ -31,4 +28,3 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-#endif // !defined(AFX_STDAFX_H__C4EFDDFC_C095_4509_B571_632F0986D162__INCLUDED)
More information about the gme-commit
mailing list