From ec857f4026388c68970ba4a818e337ae59c424d8 Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 2 May 2016 09:40:53 -0700 Subject: [PATCH] Stop using deprecated hash_map in vtune-jit.cc. Previous attempt: https://codereview.chromium.org/1924403002 Review-Url: https://codereview.chromium.org/1937753002 Cr-Commit-Position: refs/heads/master@{#35942} --- src/third_party/vtune/vtune-jit.cc | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/third_party/vtune/vtune-jit.cc b/src/third_party/vtune/vtune-jit.cc index 30f6196001..0bd19546ac 100644 --- a/src/third_party/vtune/vtune-jit.cc +++ b/src/third_party/vtune/vtune-jit.cc @@ -55,26 +55,12 @@ (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 #include -#ifdef WIN32 -#include -using namespace std; -#else -// To avoid GCC 4.4 compilation warning about hash_map being deprecated. -#define OLD_DEPRECATED __DEPRECATED -#undef __DEPRECATED -#if defined (ANDROID) -#include -using namespace std; -#else -#include -using namespace __gnu_cxx; -#endif -#define __DEPRECATED OLD_DEPRECATED -#endif - #include +#include #include "v8-vtune.h" #include "vtune-jit.h" @@ -126,11 +112,8 @@ struct HashForCodeObject { } }; -#ifdef WIN32 -typedef hash_map JitInfoMap; -#else -typedef hash_map JitInfoMap; -#endif +typedef std::unordered_map + JitInfoMap; static JitInfoMap* GetEntries() { static JitInfoMap* entries;