yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-03-01 09:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Both std::tr1::unordered_set and std::unordered_set are not allowed in

Browse source 
Google at this moment.  This change is implementing a workaround that
allows switching to hash_set and hash_map.

R=mark@chromium.org

Review URL: https://breakpad.appspot.com/6694002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1354 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ivanpe@chromium.org 2014-07-21 18:27:43 +00:00
parent 8703844b3c
commit b7aa202b54
2 changed files with 63 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/dwarf_cu_to_module.cc
View file

@ -46,25 +46,16 @@
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>
#if defined(_LIBCPP_VERSION)
#include <unordered_set>
#else
#include <tr1/unordered_set>
#endif
#include <utility> #include <utility>
#include "common/dwarf_line_to_module.h" #include "common/dwarf_line_to_module.h"
#include "common/unordered.h"
namespace google_breakpad { namespace google_breakpad {
using std::map; using std::map;
using std::pair; using std::pair;
using std::sort; using std::sort;
#if defined(_LIBCPP_VERSION)
using std::unordered_set;
#else
using std::tr1::unordered_set;
#endif
using std::vector; using std::vector;
// Data provided by a DWARF specification DIE. // Data provided by a DWARF specification DIE.

62
src/common/unordered.h Normal file
View file

@ -0,0 +1,62 @@
// Copyright (c) 2010 Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Include this file to use unordered_map and unordered_set. If tr1
// or C++11 is not available, you can switch to using hash_set and
// hash_map by defining BP_USE_HASH_SET.
#ifndef COMMON_UNORDERED_H_
#define COMMON_UNORDERED_H_
#if defined(BP_USE_HASH_SET)
#include <hash_map>
#include <hash_set>
// For hash<string>.
#include "util/hash/hash.h"
template <class T, class U, class H = __gnu_cxx::hash<T> >
struct unordered_map : public hash_map<T, U, H> {};
template <class T, class H = __gnu_cxx::hash<T> >
struct unordered_set : public hash_set<T, H> {};
#elif defined(_LIBCPP_VERSION) // c++11
#include <unordered_map>
#include <unordered_set>
using std::unordered_map;
using std::unordered_set;
#else // Fallback to tr1::unordered
#include <tr1/unordered_map>
#include <tr1/unordered_set>
using std::tr1::unordered_map;
using std::tr1::unordered_set;
#endif
#endif // COMMON_UNORDERED_H_