[mapguide-commits] r9271 - in sandbox/jng/cmake_v2: . Desktop Desktop/MgDesktop/Services Desktop/MgDesktop/Services/Feature Desktop/MgDesktop/System

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Dec 26 06:28:41 PST 2017 

Author: jng
Date: 2017-12-26 06:28:41 -0800 (Tue, 26 Dec 2017)
New Revision: 9271

Modified:
   sandbox/jng/cmake_v2/
   sandbox/jng/cmake_v2/Desktop/
   sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
   sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h
   sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp
   sandbox/jng/cmake_v2/Desktop/MgDesktop/System/Mutex.h
   sandbox/jng/cmake_v2/Desktop/MgDesktop/System/PlatformInit.cpp
Log:
Merged revision(s) 9270 from trunk/MgDev:
Some mg-desktop fixes to better compile on Linux
........



Property changes on: sandbox/jng/cmake_v2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/clean_json:8818-9180
/sandbox/jng/cmdline:9199-9217
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/coordsys_mapagent:9231-9254
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geoprocessing:9205-9229
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/ogc:9240-9255
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/utfgrid:9179-9212
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:9268
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/clean_json:8818-9180
/sandbox/jng/cmdline:9199-9217
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/coordsys_mapagent:9231-9254
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geoprocessing:9205-9229
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/ogc:9240-9255
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/utfgrid:9179-9212
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:9268,9270


Property changes on: sandbox/jng/cmake_v2/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/clean_json/Desktop:8818-9180
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
/trunk/MgDev/Desktop:9268
   + /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/clean_json/Desktop:8818-9180
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
/trunk/MgDev/Desktop:9268,9270

Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp	2017-12-26 14:24:13 UTC (rev 9270)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/Feature/FdoConnectionUtil.cpp	2017-12-26 14:28:41 UTC (rev 9271)
@@ -200,9 +200,9 @@
     FdoPtr<FdoStringElement> company = tokenParts->GetItem(0);
     FdoPtr<FdoStringElement> provider = tokenParts->GetItem(1);
 
-    STRING name = company->GetString();
+    STRING name = (FdoString*)company->GetString();
     name += L".";
-    name += provider->GetString();
+    name += (FdoString*)provider->GetString();
 
     return name;
 }

Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h	2017-12-26 14:24:13 UTC (rev 9270)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/FeatureService.h	2017-12-26 14:28:41 UTC (rev 9271)
@@ -196,7 +196,7 @@
 
     void UnregisterProvider(CREFSTRING providerName);
 
-    MgFeatureReader *MgFeatureService::GetWfsReader(MgResourceIdentifier *, CREFSTRING, MgStringCollection *, CREFSTRING, CREFSTRING, CREFSTRING);
+    MgFeatureReader *GetWfsReader(MgResourceIdentifier *, CREFSTRING, MgStringCollection *, CREFSTRING, CREFSTRING, CREFSTRING);
 
 EXTERNAL_API:
     void PurgeCache(MgResourceIdentifier* resource);

Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp	2017-12-26 14:24:13 UTC (rev 9270)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/Services/ResourceService.cpp	2017-12-26 14:28:41 UTC (rev 9271)
@@ -342,7 +342,7 @@
             STRING resType = resource->GetResourceType();
             DOMElement* docEl = doc->getDocumentElement();
             CHECKNULL(docEl, L"MgdResourceService::SetResource");
-            STRING docElName = docEl->getNodeName();
+            STRING docElName = X2W(docEl->getNodeName());
 
             //Now make sure it's the right type of XML document
 
@@ -368,7 +368,7 @@
         }
         catch (const SAXParseException& e)
         {
-            STRING msg = e.getMessage();
+            STRING msg = X2W(e.getMessage());
             XMLFileLoc lineNum = e.getLineNumber();
             XMLFileLoc colNum = e.getColumnNumber();
 
@@ -377,10 +377,10 @@
 
             STRING pubIdStr;
             if (NULL != pubId)
-                pubIdStr = pubId;
+                pubIdStr = X2W(pubId);
             STRING sysIdStr;
             if (NULL != sysId)
-                sysIdStr = sysId;
+                sysIdStr = X2W(sysId);
 
             STRING lineNumStr;
             STRING colNumStr;

Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/System/Mutex.h
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/System/Mutex.h	2017-12-26 14:24:13 UTC (rev 9270)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/System/Mutex.h	2017-12-26 14:28:41 UTC (rev 9271)
@@ -69,7 +69,7 @@
 
     ~MgdMutex()
     {
-        pthread_MgdMutex_destroy(&m_CritSect);
+        pthread_mutex_destroy(&m_CritSect);
     }
 
     void Initialize()
@@ -77,26 +77,26 @@
         if(!m_bInitialized)
         {
             m_bInitialized = true;
-            pthread_MgdMutexattr_init(&m_attributes);
-            pthread_MgdMutexattr_settype(&m_attributes, PTHREAD_MgdMutex_RECURSIVE);
-            pthread_MgdMutex_init(&m_CritSect, &m_attributes);
-            pthread_MgdMutexattr_destroy(&m_attributes);
+            pthread_mutexattr_init(&m_attributes);
+            pthread_mutexattr_settype(&m_attributes, PTHREAD_MUTEX_RECURSIVE);
+            pthread_mutex_init(&m_CritSect, &m_attributes);
+            pthread_mutexattr_destroy(&m_attributes);
         }
     }
 
     void Enter()
     {
-        pthread_MgdMutex_lock(&m_CritSect);
+        pthread_mutex_lock(&m_CritSect);
     }
 
     void Leave()
     {
-        pthread_MgdMutex_unlock(&m_CritSect);
+        pthread_mutex_unlock(&m_CritSect);
     }
 
 private:
-    pthread_MgdMutex_t m_CritSect;
-    pthread_MgdMutexattr_t m_attributes;
+    pthread_mutex_t m_CritSect;
+    pthread_mutexattr_t m_attributes;
 
 #endif //_WIN32
 

Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/System/PlatformInit.cpp
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/System/PlatformInit.cpp	2017-12-26 14:24:13 UTC (rev 9270)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/System/PlatformInit.cpp	2017-12-26 14:28:41 UTC (rev 9271)
@@ -127,7 +127,8 @@
     {
         if (MgFileUtil::IsDirectory(mentorDictPath))
         {
-            setenv("MENTOR_DICTIONARY_PATH", mentorDictPath.c_str(), 1);
+            std::string mbMentorDictPath = MgUtil::WideCharToMultiByte(mentorDictPath);
+            setenv("MENTOR_DICTIONARY_PATH", mbMentorDictPath.c_str(), 1);
         }
     }
     #endif

More information about the mapguide-commits mailing list