Replace TR1 headers with standard headers

Now that the C++11 standard is the default one, we can remove the TR1
headers and classes.
This commit is contained in:
Markus Mäkelä
2018-07-06 10:08:46 +03:00
parent 28ceb1bad8
commit 77a1417479
45 changed files with 100 additions and 112 deletions

View File

@ -17,7 +17,7 @@
#include <deque>
#include <map>
#include <string>
#include <tr1/memory>
#include <memory>
#include <cstdint>
#include <microhttpd.h>

View File

@ -16,7 +16,7 @@
#include <map>
#include <string>
#include <tr1/memory>
#include <memory>
#include <microhttpd.h>
#include <maxscale/jansson.hh>

View File

@ -362,9 +362,6 @@ private:
namespace std
{
namespace tr1
{
template<>
struct hash<MessageRegistryKey>
{
@ -377,8 +374,6 @@ struct hash<MessageRegistryKey>
}
};
}
template<>
struct equal_to<MessageRegistryKey>
{
@ -428,7 +423,7 @@ public:
private:
mxs::SpinLock m_lock;
std::tr1::unordered_map<Key, Stats> m_registry;
std::unordered_map<Key, Stats> m_registry;
};
}

View File

@ -12,7 +12,7 @@
*/
#include <maxscale/queryclassifier.hh>
#include <tr1/unordered_map>
#include <unordered_map>
#include <maxscale/alloc.h>
#include <maxscale/modutil.h>
#include <maxscale/query_classifier.h>
@ -322,8 +322,8 @@ public:
}
private:
typedef std::tr1::unordered_map<uint32_t, uint32_t> BinaryPSMap;
typedef std::tr1::unordered_map<std::string, uint32_t> TextPSMap;
typedef std::unordered_map<uint32_t, uint32_t> BinaryPSMap;
typedef std::unordered_map<std::string, uint32_t> TextPSMap;
private:
BinaryPSMap m_binary_ps;

View File

@ -14,7 +14,7 @@
#include <maxscale/cppdefs.hh>
#include <new>
#include <tr1/unordered_map>
#include <unordered_map>
#include <string>
#include <algorithm>
@ -54,7 +54,7 @@ class Users
Users& operator=(const Users&);
public:
typedef std::tr1::unordered_map<std::string, UserInfo> UserMap;
typedef std::unordered_map<std::string, UserInfo> UserMap;
Users()
{