[mapguide-commits] r5754 - in trunk/MgDev/Oem: ACE/ACE_wrappers/ace SQLite/src/Unicode

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2011-05-05 02:48:27 -0700 (Thu, 05 May 2011)
New Revision: 5754

Modified:
   trunk/MgDev/Oem/ACE/ACE_wrappers/ace/Array_Map.h
   trunk/MgDev/Oem/SQLite/src/Unicode/UnicodeString.h
Log:
Fix sqliteVM.vcxproj.
1. Fix STL error of missing _Copy_s.
2. Fix intelligence error.

Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/ace/Array_Map.h
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/ace/Array_Map.h	2011-05-05 09:29:18 UTC (rev 5753)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/ace/Array_Map.h	2011-05-05 09:48:27 UTC (rev 5754)
@@ -16,6 +16,7 @@
  */
 //=============================================================================
 
+#pragma once
 
 #ifndef ACE_ARRAY_MAP_H
 #define ACE_ARRAY_MAP_H

Modified: trunk/MgDev/Oem/SQLite/src/Unicode/UnicodeString.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Unicode/UnicodeString.h	2011-05-05 09:29:18 UTC (rev 5753)
+++ trunk/MgDev/Oem/SQLite/src/Unicode/UnicodeString.h	2011-05-05 09:48:27 UTC (rev 5754)
@@ -104,6 +104,13 @@
     copy(char_type* __s1, const char_type* __s2, size_t __n)
     {  return static_cast<char_type*>(memcpy(__s1, __s2, __n*sizeof(char_type))); }
 
+    static size_t 
+    _Copy_s(char_type* __dest, size_t __dest_count, const char_type* _off, size_t _Count)
+    {
+        copy(__dest, _off, _Count);
+        return length(__dest);
+    }
+
     static char_type*
     assign(char_type* __s, size_t __n, char_type __a)
     {