[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/inc stlport/systemstl

[Andre Fischer]

 sc/inc/refdata.hxx         |    2 +-
 stlport/systemstl/hash_map |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit fddfd6e97750acacf667fc195456d33af8828a46
Author: Andre Fischer <af at apache.org>
Date:   Wed Mar 5 11:51:34 2014 +0000

    124361: Avoid warning by not assigning from sal_Int32 to sal_Int16.

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 9550b82..b3352faa 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -78,7 +78,7 @@ struct SC_DLLPUBLIC ScSingleRefData        // Single reference (one address) int
     inline  void InitFlags() { bFlags = 0; }    // all FALSE
 
     // #123870# Make it possible to init members to some defined values
-    inline void InitMembers() { nCol = nRow = nTab = nRelCol = nRelRow = nRelTab = 0; }
+    inline void InitMembers() { nRow = nRelRow = 0; nCol = nRelCol = 0; nTab = nRelTab = 0; }
 
     // InitAddress: InitFlags and set address
     inline  void InitAddress( const ScAddress& rAdr );
commit 6fbf6653bebf3dfb6998233dff386d2ae977b152
Author: Andre Fischer <af at apache.org>
Date:   Wed Mar 5 10:51:54 2014 +0000

    124361: Avoid MSVC warning 4555 while including unordered_map.

diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 198b055..9ebcb44 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -23,16 +23,19 @@
 #define SYSTEM_STL_HASHMAP
 
 #ifdef HAVE_STL_INCLUDE_PATH
-	// TODO: use computed include file name
-	#include_next <unordered_map>
+    // TODO: use computed include file name
+    #include_next <unordered_map>
 #elif defined(__cplusplus) && (__cplusplus >= 201103L)
-	#include <unordered_map>
+    #include <unordered_map>
 #elif defined(_MSC_VER)
-	#include <../../VC/include/unordered_map>
-	#define STLP4_EMUBASE_NS ::std::tr1
+    #pragma warning(push)
+    #pragma warning(disable:4555)
+    #include <../../VC/include/unordered_map>
+    #pragma warning(pop)
+    #define STLP4_EMUBASE_NS ::std::tr1
 #else // fall back to boost/tr1
-	#include <boost/tr1/tr1/unordered_map>
-	#define STLP4_EMUBASE_NS ::boost
+    #include <boost/tr1/tr1/unordered_map>
+    #define STLP4_EMUBASE_NS ::boost
 #endif