Skip to content

C
core
Kaydet (Commit) 6fbf6653 authored tarafından Andre Fischer's avatar Andre Fischer
Dosyalara gözat
Seçenekler

124361: Avoid MSVC warning 4555 while including unordered_map.

üst aa46680d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
stlport/systemstl/hash_map
Dosyayı görüntüle @ 6fbf6653
...@@ -23,16 +23,19 @@ ...@@ -23,16 +23,19 @@
#define SYSTEM_STL_HASHMAP #define SYSTEM_STL_HASHMAP
#ifdef HAVE_STL_INCLUDE_PATH #ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name // TODO: use computed include file name
#include_next <unordered_map> #include_next <unordered_map>
#elif defined(__cplusplus) && (__cplusplus >= 201103L) #elif defined(__cplusplus) && (__cplusplus >= 201103L)
#include <unordered_map> #include <unordered_map>
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#include <../../VC/include/unordered_map> #pragma warning(push)
#define STLP4_EMUBASE_NS ::std::tr1 #pragma warning(disable:4555)
#include <../../VC/include/unordered_map>
#pragma warning(pop)
#define STLP4_EMUBASE_NS ::std::tr1
#else // fall back to boost/tr1 #else // fall back to boost/tr1
#include <boost/tr1/tr1/unordered_map> #include <boost/tr1/tr1/unordered_map>
#define STLP4_EMUBASE_NS ::boost #define STLP4_EMUBASE_NS ::boost
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment