hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace TR1 headers with standard headers

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/schemarouter/schemarouter.hh
View File

@ -24,7 +24,7 @@
#include <list>
#include <set>
#include <string>
#include <tr1/memory>
#include <memory>
#include <maxscale/buffer.hh>
#include <maxscale/pcre2.h>
@ -128,7 +128,7 @@ private:
bool m_mapped; /**< Whether the backend has been mapped */
};
typedef std::tr1::shared_ptr<SRBackend> SSRBackend;
typedef std::shared_ptr<SRBackend> SSRBackend;
typedef std::list<SSRBackend> SSRBackendList;
}

6
server/modules/routing/schemarouter/shard_map.hh
View File

@ -14,7 +14,7 @@
#include <maxscale/cppdefs.hh>
#include <tr1/unordered_map>
#include <unordered_map>
#include <string>
#include <list>
@ -24,7 +24,7 @@
using namespace maxscale;
/** This contains the database to server mapping */
typedef std::tr1::unordered_map<std::string, SERVER*> ServerMap;
typedef std::unordered_map<std::string, SERVER*> ServerMap;
class Shard
{
@ -96,7 +96,7 @@ private:
time_t m_last_updated;
};
typedef std::tr1::unordered_map<std::string, Shard> ShardMap;
typedef std::unordered_map<std::string, Shard> ShardMap;
class ShardManager
{