[commit] r1683 - in trunk/GME: Gme Gme/AutoRoute Meta Mga
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Tue Nov 15 13:32:17 CST 2011
Author: ksmyth
Date: Tue Nov 15 13:32:17 2011
New Revision: 1683
Log:
Remove unnecessary #pragma warning(disable)s
Modified:
trunk/GME/Gme/AutoRoute/AutoRouterGraph.cpp
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Gme/GMEOLEApp.cpp
trunk/GME/Gme/GMEOLEAspect.cpp
trunk/GME/Gme/GMEOLEIt.cpp
trunk/GME/Gme/GMEOLEModel.cpp
trunk/GME/Gme/GMEView.cpp
trunk/GME/Gme/GUIObject.cpp
trunk/GME/Meta/MetaUtilities.cpp
trunk/GME/Mga/StdAfx.h
Modified: trunk/GME/Gme/AutoRoute/AutoRouterGraph.cpp
==============================================================================
--- trunk/GME/Gme/AutoRoute/AutoRouterGraph.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/AutoRoute/AutoRouterGraph.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -949,7 +949,6 @@
return was;
}
-#pragma warning(disable: 4700)
void CAutoRouterGraph::CenterStairsInPathPoints(CAutoRouterPath* path, RoutingDirection hintstartdir, RoutingDirection hintenddir)
{
ASSERT( path != NULL );
@@ -1140,7 +1139,6 @@
path->AssertValidPoints();
#endif
}
-#pragma warning(default: 4700)
void CAutoRouterGraph::ConnectAllDisconnectedPaths()
{
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GMEApp.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -490,9 +490,7 @@
static int emnum;
emcode.Format(_T("-emergency%ld"), ++emnum);
embackupname.Insert(p, emcode);
-#pragma warning(disable: 4310) // cast truncates constant value
HRESULT hr = mgaProject->Save(PutInBstr(embackupname), VARIANT_TRUE);
-#pragma warning(default: 4310) // cast truncates constant value
if (proj_type_is_xmlbackend) {
AfxMessageBox(_T("Your current work can be found in the local checkout directory."));
} else {
@@ -1007,9 +1005,7 @@
}
if(redo && AfxMessageBox(_T("AddOn configuration has changed.\nRestart addons?"), MB_YESNO) == IDYES) {
COMTHROW(mgaProject->EnableAutoAddOns(VARIANT_FALSE));
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(mgaProject->EnableAutoAddOns(VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
}
}
}
@@ -1308,9 +1304,7 @@
VARIANT_BOOL readable_only;
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW( mgaProject->EnableAutoAddOns(VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
HRESULT hr = mgaProject->Open(PutInBstr(conn), &readable_only);
if(hr != S_OK) {
CComBSTR parn;
@@ -1497,9 +1491,7 @@
COMTHROW( mgaProject.CoCreateInstance(L"Mga.MgaProject") );
ASSERT( mgaProject != NULL );
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW( mgaProject->EnableAutoAddOns(VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
msg = _T("Could not create project");
HRESULT hr = mgaProject->Create(PutInBstr(conn), PutInBstr(metaname)) ;
if(hr == E_MGA_PARADIGM_NOTREG || hr == E_MGA_PARADIGM_INVALID) {
@@ -2114,9 +2106,7 @@
}
}
COMTHROW( mgaProject.CoCreateInstance(L"Mga.MgaProject") );
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW( mgaProject->EnableAutoAddOns(VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
HRESULT hr = mgaProject->CreateEx(PutInBstr(dataconn), PutInBstr(paradigm), parguid);
if(hr == E_MGA_PARADIGM_NOTREG || hr == E_MGA_PARADIGM_INVALID) {
TCHAR buf[300];
@@ -2355,9 +2345,7 @@
CComObjPtr<IMgaProject> project;
COMTHROW( project.CoCreateInstance(OLESTR("MGA.MgaProject")) );
ASSERT( project != NULL );
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW( project->CheckLocks(PutInBstr(conn), VARIANT_TRUE) );
-#pragma warning(default: 4310) // cast truncates constant value
AfxMessageBox(_T("Database locks are cleared"));
}
@@ -2820,9 +2808,7 @@
}
}
COMTHROW( mgaProject.CoCreateInstance(L"Mga.MgaProject") );
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW( mgaProject->EnableAutoAddOns(VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
HRESULT hr = mgaProject->CreateEx(PutInBstr(dataconn), PutInBstr(paradigm), parguid);
if(hr == E_MGA_PARADIGM_NOTREG || hr == E_MGA_PARADIGM_INVALID) {
TCHAR buf[300];
Modified: trunk/GME/Gme/GMEOLEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEApp.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GMEOLEApp.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -803,9 +803,7 @@
TRY_DUAL(__uuidof(IGMEOLEApp))
{
-#pragma warning(disable: 4310) // cast truncates constant value
*isVisible = (pThis->GetVisible() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
return NOERROR;
}
CATCH_ALL_DUAL
Modified: trunk/GME/Gme/GMEOLEAspect.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEAspect.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GMEOLEAspect.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -189,9 +189,7 @@
TRY_DUAL(__uuidof(IGMEOLEAspect))
{
-#pragma warning(disable: 4310) // cast truncates constant value
*isActive = (pThis->GetActive() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
return NOERROR;
}
CATCH_ALL_DUAL
@@ -203,9 +201,7 @@
TRY_DUAL(__uuidof(IGMEOLEAspect))
{
-#pragma warning(disable: 4310) // cast truncates constant value
*isValid = (pThis->GetValid() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
return NOERROR;
}
CATCH_ALL_DUAL
Modified: trunk/GME/Gme/GMEOLEIt.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEIt.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GMEOLEIt.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -3182,9 +3182,7 @@
TRY_DUAL(__uuidof(IGMEOLEIt))
{
-#pragma warning(disable: 4310) // cast truncates constant value
*p_isActive = (pThis->GetValid() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
return NOERROR;
}
CATCH_ALL_DUAL
Modified: trunk/GME/Gme/GMEOLEModel.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEModel.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GMEOLEModel.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -540,9 +540,7 @@
TRY_DUAL(__uuidof(IGMEOLEModel))
{
-#pragma warning(disable: 4310) // cast truncates constant value
*isActive = (pThis->GetActive() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
return NOERROR;
}
CATCH_ALL_DUAL
@@ -580,9 +578,7 @@
TRY_DUAL(__uuidof(IGMEOLEModel))
{
-#pragma warning(disable: 4310) // cast truncates constant value
*isValid = (pThis->GetValid() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
return NOERROR;
}
CATCH_ALL_DUAL
Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GMEView.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -1955,9 +1955,7 @@
COMTHROW(currentModel->get_RegistryNode(path, &anRoot));
if (anRoot != NULL) {
CComPtr<IMgaRegNodes> anNodes;
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(anRoot->get_SubNodes(VARIANT_TRUE, &anNodes));
-#pragma warning(default: 4310) // cast truncates constant value
CreateAnnotators(anNodes, annotators);
}
}
@@ -3589,9 +3587,7 @@
}
else {
CComPtr<IMgaFCO> obj;
-#pragma warning(disable: 4310) // cast truncates constant value
VARIANT_BOOL inst = instance ? VARIANT_TRUE : VARIANT_FALSE;
-#pragma warning(default: 4310) // cast truncates constant value
if((hr = currentModel->DeriveChildObject(fco,newRole,inst,&obj)) != S_OK) {
CString msg( (LPCTSTR) fcoName); msg += _T(" cannot be derived! Some of its ancestors or descendants may be already derived!");
if( hr == E_MGA_NOT_DERIVABLE)
@@ -3677,9 +3673,7 @@
CComPtr<IMgaConnection> conn;
if(fco.QueryInterface(&conn) != S_OK) { // skip connections, they cannot be referenced
CComPtr<IMgaMetaRole> role;
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(doc->resolver->put_IsStickyEnabled(::GetKeyState(VK_SHIFT) < 0 ? VARIANT_FALSE :VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
HRESULT hr = doc->resolver->get_RefRoleByMeta(currentModel,aspect,fco,&role);
if (hr == E_ABORT) {
return false;
@@ -4056,9 +4050,7 @@
dstPort = dstPort->IsRealPort() ? dstPort : NULL;
if (dstPort) CGMEEventLogger::LogGMEEvent(_T(" dstPort=")+dstPort->GetName()+_T(" ")+dstPort->GetID()+_T("\r\n"));
}
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(doc->resolver->put_IsStickyEnabled(nosticky ? VARIANT_FALSE :VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
COMTHROW(doc->resolver->get_ConnRoleByMeta( currentModel,
aspect,
src->mgaFco,
Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Gme/GUIObject.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -320,9 +320,7 @@
COMTHROW(fco->get_RegistryNode(bstr,&root));
CComPtr<IMgaRegNodes> nodes;
-#pragma warning(disable: 4310) // cast truncates constant value
VARIANT_BOOL vb = VARIANT_TRUE;
-#pragma warning(default: 4310) // cast truncates constant value
COMTHROW(root->get_SubNodes(vb,&nodes));
MGACOLL_ITERATE(IMgaRegNode,nodes) {
CComPtr<IMgaRegNode> reg;
@@ -463,9 +461,7 @@
if (aspRootNode) {
CComPtr<IMgaRegNodes> aspNodes;
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(aspRootNode->get_SubNodes(VARIANT_TRUE, &aspNodes));
-#pragma warning(default: 4310) // cast truncates constant value
MGACOLL_ITERATE(IMgaRegNode, aspNodes) {
CComPtr<IMgaRegNode> aspNode;
aspNode = MGACOLL_ITER;
@@ -612,9 +608,7 @@
if (decoratorData[parentAspect]->decorator) {
grayedOut = set;
try {
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(decoratorData[parentAspect]->decorator->SetActive(set ? VARIANT_FALSE : VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
}
catch (hresult_exception &) {
}
@@ -1954,9 +1948,7 @@
for (int i = 0; i< guiAspects.GetSize(); i++) {
if (IsVisible(i)) {
-#pragma warning(disable: 4310) // cast truncates constant value
COMTHROW(guiAspects[i]->GetDecorator()->SetActive(set ? VARIANT_FALSE : VARIANT_TRUE));
-#pragma warning(default: 4310) // cast truncates constant value
}
}
}
Modified: trunk/GME/Meta/MetaUtilities.cpp
==============================================================================
--- trunk/GME/Meta/MetaUtilities.cpp Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Meta/MetaUtilities.cpp Tue Nov 15 13:32:17 2011 (r1683)
@@ -69,9 +69,7 @@
COMTHROW( p->get_LoadedAttrValue(attrid, PutOut(v)) );
ASSERT( v.vt == VT_I4 );
-#pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
- return v.lVal;
-#pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
+ return v.lVal ? VARIANT_TRUE : VARIANT_FALSE;
}
void CCoreObjectPtr::GetPointerValue(attrid_type attrid, CCoreObjectPtr &ret) const
Modified: trunk/GME/Mga/StdAfx.h
==============================================================================
--- trunk/GME/Mga/StdAfx.h Tue Nov 15 13:31:54 2011 (r1682)
+++ trunk/GME/Mga/StdAfx.h Tue Nov 15 13:32:17 2011 (r1683)
@@ -39,8 +39,6 @@
#include <hash_map>
#pragma warning(pop)
-#pragma warning(disable : 4100 4239 4244)
-
#ifdef _DEBUG
#define MGA_TRACE AtlTrace
#else
More information about the gme-commit
mailing list