[mapguide-commits] r8702 - in sandbox/VC140/Oem: dbxml/dbxml/src/dbxml/nodeStore dbxml/xqilla/include/xqilla/framework jsoncpp/src/lib_json

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2015-07-12 23:23:16 -0700 (Sun, 12 Jul 2015)
New Revision: 8702

Modified:
   sandbox/VC140/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp
   sandbox/VC140/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp
   sandbox/VC140/Oem/jsoncpp/src/lib_json/lib_json.vcxproj
Log:
RFC 150: Fix 2 build errors.

1. XQillaAllocator: change operator == to   
bool operator ==(const XQillaAllocator<_Tp>& o) const 
The build will fail without 'const' keyword
2. Update the lib_json.vcxproj, set DisableLanguageExtensions to 'No'.

Modified: sandbox/VC140/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp
===================================================================
--- sandbox/VC140/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp	2015-07-09 12:10:50 UTC (rev 8701)
+++ sandbox/VC140/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp	2015-07-13 06:23:16 UTC (rev 8702)
@@ -206,7 +206,7 @@
 	bool needsEscape = false;
 	if (!len)
 		len = NsUtil::nsStringLen(characters);
-	enum checkType ttype = (isCDATA || ignorable) ? ignore : isCharacters;
+	enum checkType ttype = (isCDATA || ignorable) ? checkType::ignore : isCharacters;
 	NsDonator chars(characters, len, ttype);
 	uint32_t textType;
 	if (isCDATA)

Modified: sandbox/VC140/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp
===================================================================
--- sandbox/VC140/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp	2015-07-09 12:10:50 UTC (rev 8701)
+++ sandbox/VC140/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp	2015-07-13 06:23:16 UTC (rev 8702)
@@ -132,7 +132,7 @@
 #endif
 #if _MSC_VER >= 1700
   // Needed for Vistual Studio 2012
-  bool operator ==(const XQillaAllocator<_Tp>& o)
+  bool operator ==(const XQillaAllocator<_Tp>& o) const
   {
       if (_memMgr == o._memMgr)
           return true;

Modified: sandbox/VC140/Oem/jsoncpp/src/lib_json/lib_json.vcxproj
===================================================================
--- sandbox/VC140/Oem/jsoncpp/src/lib_json/lib_json.vcxproj	2015-07-09 12:10:50 UTC (rev 8701)
+++ sandbox/VC140/Oem/jsoncpp/src/lib_json/lib_json.vcxproj	2015-07-13 06:23:16 UTC (rev 8702)
@@ -96,7 +96,6 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -112,7 +111,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -128,7 +127,6 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -144,7 +142,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -156,7 +154,6 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -172,7 +169,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -187,7 +184,6 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -204,7 +200,6 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>