[mapguide-commits] r6725 - branches/2.4/MgDev/Common/Foundation/System
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jun 1 01:35:17 PDT 2012
Author: jng
Date: 2012-06-01 01:35:16 -0700 (Fri, 01 Jun 2012)
New Revision: 6725
Modified:
branches/2.4/MgDev/Common/Foundation/System/Util.h
Log:
Backport r6724
Modified: branches/2.4/MgDev/Common/Foundation/System/Util.h
===================================================================
--- branches/2.4/MgDev/Common/Foundation/System/Util.h 2012-06-01 07:09:44 UTC (rev 6724)
+++ branches/2.4/MgDev/Common/Foundation/System/Util.h 2012-06-01 08:35:16 UTC (rev 6725)
@@ -585,8 +585,8 @@
#define CHECKNULL(pointer, methodname) \
if (pointer == NULL) \
{ \
- MgStringCollection args; \
- args.Add(L#pointer); \
+ MgStringCollection args; \
+ args.Add(L###pointer); \
throw new MgNullReferenceException(methodname, \
__LINE__, __WFILE__, NULL, L"MgNullPointer", &args); \
}
@@ -594,8 +594,8 @@
#define CHECKARGUMENTNULL(pointer, methodname) \
if (pointer == NULL) \
{ \
- MgStringCollection args; \
- args.Add(L#pointer); \
+ MgStringCollection args; \
+ args.Add(L###pointer); \
throw new MgNullArgumentException(methodname, \
__LINE__, __WFILE__, NULL, L"MgNullArgument", &args); \
}
@@ -605,14 +605,10 @@
{ \
if (NULL != methodName) \
{ \
- std::wostringstream minStr; \
- minStr << min; \
- std::wostringstream maxStr; \
- maxStr << max; \
- MgStringCollection args; \
- args.Add(minStr.str()); \
- args.Add(maxStr.str()); \
- args.Add(L#value); \
+ MgStringCollection args; \
+ args.Add(L#min); \
+ args.Add(L#max); \
+ args.Add(L###value); \
throw new MgArgumentOutOfRangeException( \
methodName, __LINE__, __WFILE__, NULL, L"MgArgumentOutOfRange", &args); \
} \
More information about the mapguide-commits
mailing list