[commit] r2039 - in trunk/GME: Annotator Console ConstraintManager Core GMEActiveBrowser Gme Meta Mga MgaDecorators MgaUtil ObjectInspector PanningView PartBrowser Search XmlBackEnd
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Sep 5 16:30:33 CDT 2012
Author: ksmyth
Date: Wed Sep 5 16:30:33 2012
New Revision: 2039
Log:
Fixes for VS2012
Modified:
trunk/GME/Annotator/DecoratorApp.cpp
trunk/GME/Console/Console.cpp
trunk/GME/ConstraintManager/ConstraintManager.cpp
trunk/GME/ConstraintManager/OCLFactory.h
trunk/GME/ConstraintManager/OCLType.h
trunk/GME/Core/CoreBinFile.h
trunk/GME/GMEActiveBrowser/GMEActiveBrowser.cpp
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Meta/MgaMetaProject.cpp
trunk/GME/Mga/MgaAttribute.cpp
trunk/GME/MgaDecorators/MgaDecorators.cpp
trunk/GME/MgaUtil/MgaUtilApp.cpp
trunk/GME/ObjectInspector/InspectorEntry.h
trunk/GME/ObjectInspector/ObjectInspector.cpp
trunk/GME/ObjectInspector/ObjectInspector.vcxproj
trunk/GME/ObjectInspector/StdAfx.h
trunk/GME/PanningView/PanningView.cpp
trunk/GME/PartBrowser/PartBrowser.cpp
trunk/GME/Search/Search.cpp
trunk/GME/Search/Search.vcxproj
trunk/GME/XmlBackEnd/XmlBackEnd.cpp
trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj
Modified: trunk/GME/Annotator/DecoratorApp.cpp
==============================================================================
--- trunk/GME/Annotator/DecoratorApp.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Annotator/DecoratorApp.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -51,6 +51,7 @@
BOOL CDecoratorApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -76,6 +77,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
_Module.Init(ObjectMap, m_hInstance, &LIBID_DecoratorLib);
return CWinApp::InitInstance();
Modified: trunk/GME/Console/Console.cpp
==============================================================================
--- trunk/GME/Console/Console.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Console/Console.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -26,6 +26,7 @@
BOOL CConsoleApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -51,6 +52,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
BOOL bInit = COleControlModule::InitInstance();
if (!InitATL())
Modified: trunk/GME/ConstraintManager/ConstraintManager.cpp
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintManager.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ConstraintManager/ConstraintManager.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -54,6 +54,7 @@
BOOL CConstraintManagerApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -79,6 +80,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
_Module.Init(ObjectMap, m_hInstance, &LIBID_CONSTRAINTMANAGERLib);
return CWinApp::InitInstance();
Modified: trunk/GME/ConstraintManager/OCLFactory.h
==============================================================================
--- trunk/GME/ConstraintManager/OCLFactory.h Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ConstraintManager/OCLFactory.h Wed Sep 5 16:30:33 2012 (r2039)
@@ -11,6 +11,8 @@
#include "OCLSignature.h"
#include "OCLFeature.h"
+#include <memory>
+
namespace OclMeta {
class Type;
class TypeManager;
Modified: trunk/GME/ConstraintManager/OCLType.h
==============================================================================
--- trunk/GME/ConstraintManager/OCLType.h Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ConstraintManager/OCLType.h Wed Sep 5 16:30:33 2012 (r2039)
@@ -14,6 +14,8 @@
#include "OCLFeature.h"
#include "OCLSignature.h"
+#include <memory>
+
namespace OclMeta
{
class Type;
Modified: trunk/GME/Core/CoreBinFile.h
==============================================================================
--- trunk/GME/Core/CoreBinFile.h Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Core/CoreBinFile.h Wed Sep 5 16:30:33 2012 (r2039)
@@ -9,6 +9,7 @@
#include <map>
#include <vector>
#include <algorithm>
+#include <memory>
#include "windows.h"
class membuf
Modified: trunk/GME/GMEActiveBrowser/GMEActiveBrowser.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/GMEActiveBrowser.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/GMEActiveBrowser/GMEActiveBrowser.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -26,6 +26,7 @@
BOOL CGMEActiveBrowserApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -51,6 +52,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
BOOL bInit = COleControlModule::InitInstance();
if (!InitATL())
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Gme/GMEApp.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -257,6 +257,7 @@
InitCtrls.dwICC = ICC_WIN95_CLASSES;
InitCommonControlsEx(&InitCtrls);
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -282,6 +283,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
CWinAppEx::InitInstance();
Modified: trunk/GME/Meta/MgaMetaProject.cpp
==============================================================================
--- trunk/GME/Meta/MgaMetaProject.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Meta/MgaMetaProject.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -3,6 +3,7 @@
#include "MgaMetaProject.h"
#include "MgaMetaFolder.h"
#include <time.h>
+#include <functional>
// ------- CurrentTime
Modified: trunk/GME/Mga/MgaAttribute.cpp
==============================================================================
--- trunk/GME/Mga/MgaAttribute.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Mga/MgaAttribute.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -761,7 +761,7 @@
if (mypath != L"")
COMTHROW(subpath.Append("/"));
COMTHROW(subpath.Append(path));
- paths.insert(subpath);
+ paths.insert(std::wstring(subpath));
} MGACOLL_ITERATE_END;
}
}
Modified: trunk/GME/MgaDecorators/MgaDecorators.cpp
==============================================================================
--- trunk/GME/MgaDecorators/MgaDecorators.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/MgaDecorators/MgaDecorators.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -50,6 +50,7 @@
BOOL CMgaDecoratorsApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -75,6 +76,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
_Module.Init(ObjectMap, m_hInstance, &LIBID_MGADECORATORLib);
return CWinApp::InitInstance();
Modified: trunk/GME/MgaUtil/MgaUtilApp.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaUtilApp.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/MgaUtil/MgaUtilApp.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -114,6 +114,7 @@
BOOL CMgaUtilApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -139,6 +140,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
if (!InitATL())
return FALSE;
Modified: trunk/GME/ObjectInspector/InspectorEntry.h
==============================================================================
--- trunk/GME/ObjectInspector/InspectorEntry.h Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ObjectInspector/InspectorEntry.h Wed Sep 5 16:30:33 2012 (r2039)
@@ -5,9 +5,7 @@
#if !defined(AFX_INSPECTORENTRY_H__EC3A0721_9A2C_4BA0_9350_26E7ED5AFA7A__INCLUDED_)
#define AFX_INSPECTORENTRY_H__EC3A0721_9A2C_4BA0_9350_26E7ED5AFA7A__INCLUDED_
-#if _MSC_VER > 1000
#pragma once
-#endif // _MSC_VER > 1000
class CInspectorEntry;
Modified: trunk/GME/ObjectInspector/ObjectInspector.cpp
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspector.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ObjectInspector/ObjectInspector.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -10,7 +10,7 @@
#endif
-CObjectInspectorApp NEAR theApp;
+CObjectInspectorApp theApp;
const GUID CDECL BASED_CODE _tlid =
{ 0x92b54998, 0x8e88, 0x41a2, { 0x92, 0x4f, 0x73, 0x54, 0xca, 0xd1, 0x45, 0x65 } };
@@ -23,6 +23,7 @@
BOOL CObjectInspectorApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -48,6 +49,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
BOOL bInit = COleControlModule::InitInstance();
Modified: trunk/GME/ObjectInspector/ObjectInspector.vcxproj
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspector.vcxproj Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ObjectInspector/ObjectInspector.vcxproj Wed Sep 5 16:30:33 2012 (r2039)
@@ -293,6 +293,10 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Win32</TargetEnvironment>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">unused_%(Filename).h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">unused_%(Filename).h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">unused_%(Filename).h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">unused_%(Filename).h</HeaderFileName>
</Midl>
</ItemGroup>
<ItemGroup>
Modified: trunk/GME/ObjectInspector/StdAfx.h
==============================================================================
--- trunk/GME/ObjectInspector/StdAfx.h Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/ObjectInspector/StdAfx.h Wed Sep 5 16:30:33 2012 (r2039)
@@ -35,12 +35,15 @@
// database classes
#include <afxdb.h> // MFC database classes
+#include "Mga.h"
+
#include "CommonError.h"
#include "CommonSmart.h"
#include "CommonMfc.h"
#include "CommonMgaTrukk.h"
+#include "Resource.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
Modified: trunk/GME/PanningView/PanningView.cpp
==============================================================================
--- trunk/GME/PanningView/PanningView.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/PanningView/PanningView.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -21,6 +21,7 @@
BOOL CPanningViewApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -46,6 +47,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
BOOL bInit = COleControlModule::InitInstance();
Modified: trunk/GME/PartBrowser/PartBrowser.cpp
==============================================================================
--- trunk/GME/PartBrowser/PartBrowser.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/PartBrowser/PartBrowser.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -28,6 +28,7 @@
BOOL CPartBrowserApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -53,6 +54,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
_Module.Init(ObjectMap, m_hInstance, &LIBID_PartBrowserLib);
Modified: trunk/GME/Search/Search.cpp
==============================================================================
--- trunk/GME/Search/Search.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Search/Search.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -23,6 +23,7 @@
BOOL CSearchApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -48,6 +49,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
BOOL bInit = COleControlModule::InitInstance();
Modified: trunk/GME/Search/Search.vcxproj
==============================================================================
--- trunk/GME/Search/Search.vcxproj Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/Search/Search.vcxproj Wed Sep 5 16:30:33 2012 (r2039)
@@ -252,7 +252,12 @@
<None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <Midl Include="Search.odl" />
+ <Midl Include="Search.odl">
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">unused_%(Filename).h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">unused_%(Filename).h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">unused_%(Filename).h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">unused_%(Filename).h</HeaderFileName>
+ </Midl>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Attribute.h" />
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.cpp
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.cpp Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.cpp Wed Sep 5 16:30:33 2012 (r2039)
@@ -53,6 +53,7 @@
BOOL CXmlBackEndApp::InitInstance()
{
+#if _MSC_VER < 1700
// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
// MFC module state handling code is changed with VC80.
// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -78,6 +79,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
_Module.Init(ObjectMap, m_hInstance, &LIBID_XMLBACKENDLib);
return CWinApp::InitInstance();
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj Thu Aug 30 14:58:44 2012 (r2038)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj Wed Sep 5 16:30:33 2012 (r2039)
@@ -117,7 +117,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>mfcs100d.lib;xerces-c_3.lib;comsvcs.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>mfcs$(PlatformToolsetVersion)d.lib;xerces-c_3.lib;comsvcs.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\lib\subv_$(Configuration);../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>.\XmlBackEnd.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -206,7 +206,7 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>mfcs100.lib;xerces-c_3.lib;comsvcs.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>mfcs$(PlatformToolsetVersion).lib;xerces-c_3.lib;comsvcs.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\lib\subv_$(Configuration);../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
More information about the gme-commit
mailing list