From 78839ec15caeea8fd78954042e53d098b95b7caf Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 27 Oct 2020 16:39:28 +0100
Subject: [PATCH] tr1 is obsolete in the stdlib
---
ACSLToken.cpp | 8 ++++----
ACSLToken.h | 6 +++---
tests/da/CLII.cpp | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ACSLToken.cpp b/ACSLToken.cpp
index 93f505a9..35b9ce00 100644
--- a/ACSLToken.cpp
+++ b/ACSLToken.cpp
@@ -134,7 +134,7 @@ KeywordToken::mapUnicode[] = {
};
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
KeywordToken::_unicodeKeywords(
mapUnicode,
mapUnicode + sizeof(mapUnicode) / sizeof(mapUnicode[0]));
@@ -238,7 +238,7 @@ KeywordToken::mapUnprotected[] = {
std::make_pair("allocates", TAllocates)
};
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
KeywordToken::_unprotectedKeywords(
mapUnprotected,
mapUnprotected + sizeof(mapUnprotected) / sizeof(mapUnprotected[0]));
@@ -429,13 +429,13 @@ KeywordToken::mapProtected[] = {
};
*/
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
KeywordToken::_protectedKeywords(
mapProtected,
mapProtected + sizeof(mapProtected) / sizeof(mapProtected[0]));
/*
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
KeywordToken::_protectedKeywords =
{ { "forall", TForall },
{ "exists", TLExists },
diff --git a/ACSLToken.h b/ACSLToken.h
index 81b2ae6f..b0989a12 100644
--- a/ACSLToken.h
+++ b/ACSLToken.h
@@ -28,7 +28,7 @@
#ifndef ACSL_TokenH
#include "DescentParse.h"
-#include <tr1/unordered_map>
+#include <unordered_map>
#include <sstream>
/** @file */
@@ -258,7 +258,7 @@ class KeywordToken : public AbstractToken {
TEnd
};
- typedef std::tr1::unordered_map<std::string, Type> Map;
+ typedef std::unordered_map<std::string, Type> Map;
typedef std::pair<std::string, KeywordToken::Type> Connection;
static Connection mapUnicode[];
@@ -559,7 +559,7 @@ public:
virtual std::string text() const;
- typedef std::tr1::unordered_map<std::string, Type> Map;
+ typedef std::unordered_map<std::string, Type> Map;
typedef std::pair<std::string, OperatorPunctuatorToken::Type> Connection;
static Connection mapUnicode[];
diff --git a/tests/da/CLII.cpp b/tests/da/CLII.cpp
index 15f3fd3d..9d3f77af 100644
--- a/tests/da/CLII.cpp
+++ b/tests/da/CLII.cpp
@@ -26521,7 +26521,7 @@ public:
virtual char const * what() const throw()
{
- return "tr1::bad_weak_ptr";
+ return "bad_weak_ptr";
}
};
--
GitLab