[commit] r1690 - trunk/GME/Common

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Nov 16 10:02:14 2011
New Revision: 1690

Log:
Fix COMCATCH for non-atl projects

Modified:
   trunk/GME/Common/CommonError.h

Modified: trunk/GME/Common/CommonError.h
==============================================================================
--- trunk/GME/Common/CommonError.h	Tue Nov 15 17:20:15 2011	(r1689)
+++ trunk/GME/Common/CommonError.h	Wed Nov 16 10:02:14 2011	(r1690)
@@ -59,6 +59,20 @@
 
 #define COMTRY try
 
+#ifdef __AFX_H__
+#define CATCH_CMEMORY_EXCEPTION(CLEANUP) \
+    catch (CMemoryException* e) \
+	{ \
+		try { CLEANUP; } catch (const std::bad_alloc& ) { } \
+		e->Delete(); \
+		SetStandardOrGMEErrorInfo(E_OUTOFMEMORY); \
+		return E_OUTOFMEMORY; \
+	}
+#else
+#define CATCH_CMEMORY_EXCEPTION(CLEANUP)
+#endif
+
+
 #define COMCATCH(CLEANUP) \
 	catch(hresult_exception &e) \
 	{ \
@@ -82,13 +96,7 @@
 		SetStandardOrGMEErrorInfo(E_OUTOFMEMORY); \
 		return E_OUTOFMEMORY; \
 	} \
-	catch (CMemoryException* e) \
-	{ \
-		try { CLEANUP; } catch (const std::bad_alloc& ) { } \
-		e->Delete(); \
-		SetStandardOrGMEErrorInfo(E_OUTOFMEMORY); \
-		return E_OUTOFMEMORY; \
-	} \
+    CATCH_CMEMORY_EXCEPTION(CLEANUP) \
 	return S_OK;
 
 #define COMRETURN(HR) \