mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 07:19:04 +08:00
170e44d327
* [breakpad] add support for Android triplets This changes vcpkg's custom CMakeLists.txt file for Breakpad so that it correctly builds libbreakpad_client for Android. It follows the same source file layout for Android as seen in the ./android/google_breakpad/Android.mk make file. * [breakpad] update control file * [breakpad] update versions * [breakpad] fix for unordered_map in MSVC++ STL and libstdc++ * [breakpad] update versions * [breakpad] fix to install libbreakpad on non-Android platforms * [breakpad] update versions * [breakpad] Read sources list from Android.mk Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
15 lines
587 B
Diff
15 lines
587 B
Diff
diff --git a/src/common/unordered.h b/src/common/unordered.h
|
|
index c9cbd58..7743eda 100644
|
|
--- a/src/common/unordered.h
|
|
+++ b/src/common/unordered.h
|
|
@@ -46,7 +46,8 @@ struct unordered_map : public __gnu_cxx::hash_map<T, U, H> {};
|
|
template <class T, class H = __gnu_cxx::hash<T> >
|
|
struct unordered_set : public __gnu_cxx::hash_set<T, H> {};
|
|
|
|
-#elif defined(_LIBCPP_VERSION) // c++11
|
|
+#elif (__cplusplus >= 201103L) || defined(_LIBCPP_VERSION) || \
|
|
+ (defined(_MSC_VER) && (_MSC_VER >= 1800)) // c++11
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
using std::unordered_map;
|