From 77a14174794cd2f89342d5ace10fd1a69332a4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 6 Jul 2018 10:08:46 +0300 Subject: [PATCH] Replace TR1 headers with standard headers Now that the C++11 standard is the default one, we can remove the TR1 headers and classes. --- include/maxscale/backend.hh | 4 ++-- include/maxscale/config.h | 4 ++-- include/maxscale/queryclassifier.hh | 10 +++++----- include/maxscale/session.h | 8 ++++---- include/maxscale/session_command.hh | 4 ++-- include/maxscale/thread.hh | 2 +- include/maxscale/utils.hh | 4 ++-- include/maxscale/worker.hh | 4 ++-- server/core/internal/httprequest.hh | 2 +- server/core/internal/httpresponse.hh | 2 +- server/core/log_manager.cc | 7 +------ server/core/queryclassifier.cc | 6 +++--- server/core/users.cc | 4 ++-- server/modules/filter/cache/cache.hh | 8 ++++---- server/modules/filter/cache/cache_storage_api.hh | 7 +------ server/modules/filter/cache/cachemt.cc | 2 +- server/modules/filter/cache/cachept.cc | 2 +- server/modules/filter/cache/cachept.hh | 4 ++-- server/modules/filter/cache/cachesimple.hh | 4 ++-- server/modules/filter/cache/cachest.cc | 2 +- server/modules/filter/cache/lrustorage.hh | 4 ++-- server/modules/filter/cache/rules.h | 4 ++-- .../storage/storage_inmemory/inmemorystorage.hh | 4 ++-- .../modules/filter/cache/test/testkeygeneration.cc | 3 +-- server/modules/filter/dbfwfilter/dbfwfilter.hh | 8 ++++---- server/modules/filter/dbfwfilter/rules.hh | 4 ++-- server/modules/filter/dbfwfilter/user.hh | 6 +++--- server/modules/filter/masking/maskingfilter.cc | 6 +++--- server/modules/filter/masking/maskingfilter.hh | 4 ++-- .../modules/filter/masking/maskingfiltersession.hh | 4 ++-- server/modules/filter/masking/maskingrules.cc | 2 +- server/modules/filter/masking/maskingrules.hh | 6 +++--- server/modules/filter/masking/test/testrules.cc | 3 +-- server/modules/monitor/galeramon/galeramon.hh | 4 ++-- server/modules/monitor/mariadbmon/mariadbmon.hh | 8 ++++---- server/modules/monitor/mariadbmon/mariadbserver.hh | 2 +- .../modules/routing/avrorouter/avro_converter.hh | 4 ++-- server/modules/routing/avrorouter/rpl.hh | 14 +++++++------- server/modules/routing/hintrouter/dcb.hh | 4 ++-- .../routing/hintrouter/hintroutersession.hh | 4 ++-- .../routing/readwritesplit/readwritesplit.hh | 6 +++--- server/modules/routing/readwritesplit/rwbackend.hh | 4 ++-- .../routing/readwritesplit/rwsplitsession.hh | 4 ++-- .../modules/routing/schemarouter/schemarouter.hh | 4 ++-- server/modules/routing/schemarouter/shard_map.hh | 6 +++--- 45 files changed, 100 insertions(+), 112 deletions(-) diff --git a/include/maxscale/backend.hh b/include/maxscale/backend.hh index c2a05697e..b27e285a5 100644 --- a/include/maxscale/backend.hh +++ b/include/maxscale/backend.hh @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -359,6 +359,6 @@ private: std::string m_uri; /**< The combined address and port */ }; -typedef std::tr1::shared_ptr SBackend; +typedef std::shared_ptr SBackend; typedef std::list BackendList; } diff --git a/include/maxscale/config.h b/include/maxscale/config.h index d827702ed..62602bef2 100644 --- a/include/maxscale/config.h +++ b/include/maxscale/config.h @@ -29,10 +29,10 @@ #include #ifdef __cplusplus -#include +#include #include // A mapping from a path to a percentage, e.g.: "/disk" -> 80. -typedef std::tr1::unordered_map MxsDiskSpaceThreshold; +typedef std::unordered_map MxsDiskSpaceThreshold; #else typedef void MxsDiskSpaceThreshold; #endif diff --git a/include/maxscale/queryclassifier.hh b/include/maxscale/queryclassifier.hh index aefa08e8e..c366f4282 100644 --- a/include/maxscale/queryclassifier.hh +++ b/include/maxscale/queryclassifier.hh @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -107,7 +107,7 @@ public: virtual bool supports_hint(HINT_TYPE hint_type) const = 0; }; - typedef std::tr1::unordered_set TableSet; + typedef std::unordered_set TableSet; // NOTE: For the time being these must be exactly like the ones in readwritesplit.hh enum @@ -371,7 +371,7 @@ private: class PSManager; typedef std::shared_ptr SPSManager; - typedef std::tr1::unordered_map HandleMap; + typedef std::unordered_map HandleMap; static bool find_table(QueryClassifier& qc, const std::string& table); static bool delete_table(QueryClassifier& qc, const std::string& table); diff --git a/include/maxscale/session.h b/include/maxscale/session.h index 0bb139c0c..955f8dd46 100644 --- a/include/maxscale/session.h +++ b/include/maxscale/session.h @@ -28,13 +28,13 @@ #include #ifdef __cplusplus -#include -#include +#include +#include #include #include #include typedef std::deque > SessionStmtQueue; -typedef std::tr1::unordered_set DCBSet; +typedef std::unordered_set DCBSet; #else typedef void SessionStmtQueue; typedef void DCBSet; @@ -184,7 +184,7 @@ typedef struct session_variable void* context; } SESSION_VARIABLE; -typedef std::tr1::unordered_map SessionVarsByName; +typedef std::unordered_map SessionVarsByName; #else typedef void SessionVarsByName; #endif diff --git a/include/maxscale/session_command.hh b/include/maxscale/session_command.hh index 75a846ded..7ec2e74ad 100644 --- a/include/maxscale/session_command.hh +++ b/include/maxscale/session_command.hh @@ -14,7 +14,7 @@ #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace maxscale { class SessionCommand; -typedef std::tr1::shared_ptr SSessionCommand; +typedef std::shared_ptr SSessionCommand; typedef std::list SessionCommandList; class SessionCommand diff --git a/include/maxscale/thread.hh b/include/maxscale/thread.hh index d3381d9a5..82536000b 100644 --- a/include/maxscale/thread.hh +++ b/include/maxscale/thread.hh @@ -13,7 +13,7 @@ */ #include -#include +#include #include #include diff --git a/include/maxscale/utils.hh b/include/maxscale/utils.hh index e7a0eaf32..569b270bc 100644 --- a/include/maxscale/utils.hh +++ b/include/maxscale/utils.hh @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -352,7 +352,7 @@ public: } private: - typedef typename std::tr1::unordered_map ContainerType; + typedef typename std::unordered_map ContainerType; ContainerType m_registry; }; diff --git a/include/maxscale/worker.hh b/include/maxscale/worker.hh index c9cfc03fc..b86a0070c 100644 --- a/include/maxscale/worker.hh +++ b/include/maxscale/worker.hh @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include @@ -1147,7 +1147,7 @@ private: typedef DelegatingTimer PrivateTimer; typedef std::multimap DelayedCallsByTime; - typedef std::tr1::unordered_map DelayedCallsById; + typedef std::unordered_map DelayedCallsById; STATISTICS m_statistics; /*< Worker statistics. */ MessageQueue* m_pQueue; /*< The message queue of the worker. */ diff --git a/server/core/internal/httprequest.hh b/server/core/internal/httprequest.hh index 7d5e0d14e..feea2d840 100644 --- a/server/core/internal/httprequest.hh +++ b/server/core/internal/httprequest.hh @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/core/internal/httpresponse.hh b/server/core/internal/httpresponse.hh index db2c23b0e..58e81b13b 100644 --- a/server/core/internal/httpresponse.hh +++ b/server/core/internal/httpresponse.hh @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index 28cd20449..20d340ddf 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -362,9 +362,6 @@ private: namespace std { -namespace tr1 -{ - template<> struct hash { @@ -377,8 +374,6 @@ struct hash } }; -} - template<> struct equal_to { @@ -428,7 +423,7 @@ public: private: mxs::SpinLock m_lock; - std::tr1::unordered_map m_registry; + std::unordered_map m_registry; }; } diff --git a/server/core/queryclassifier.cc b/server/core/queryclassifier.cc index e6d035157..e55be8520 100644 --- a/server/core/queryclassifier.cc +++ b/server/core/queryclassifier.cc @@ -12,7 +12,7 @@ */ #include -#include +#include #include #include #include @@ -322,8 +322,8 @@ public: } private: - typedef std::tr1::unordered_map BinaryPSMap; - typedef std::tr1::unordered_map TextPSMap; + typedef std::unordered_map BinaryPSMap; + typedef std::unordered_map TextPSMap; private: BinaryPSMap m_binary_ps; diff --git a/server/core/users.cc b/server/core/users.cc index 2cd609a55..692ccaffe 100644 --- a/server/core/users.cc +++ b/server/core/users.cc @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -54,7 +54,7 @@ class Users Users& operator=(const Users&); public: - typedef std::tr1::unordered_map UserMap; + typedef std::unordered_map UserMap; Users() { diff --git a/server/modules/filter/cache/cache.hh b/server/modules/filter/cache/cache.hh index 9cd36f23a..cdd9a4993 100644 --- a/server/modules/filter/cache/cache.hh +++ b/server/modules/filter/cache/cache.hh @@ -13,8 +13,8 @@ */ #include -#include -#include +#include +#include #include #include #include @@ -35,8 +35,8 @@ public: INFO_ALL = (INFO_RULES | INFO_PENDING | INFO_STORAGE) }; - typedef std::tr1::shared_ptr SCacheRules; - typedef std::tr1::shared_ptr SStorageFactory; + typedef std::shared_ptr SCacheRules; + typedef std::shared_ptr SStorageFactory; virtual ~Cache(); diff --git a/server/modules/filter/cache/cache_storage_api.hh b/server/modules/filter/cache/cache_storage_api.hh index 6a7a514b4..c6a95eee0 100644 --- a/server/modules/filter/cache/cache_storage_api.hh +++ b/server/modules/filter/cache/cache_storage_api.hh @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "cache_storage_api.h" @@ -31,9 +31,6 @@ struct equal_to } }; -namespace tr1 -{ - template<> struct hash { @@ -45,8 +42,6 @@ struct hash } -} - std::string cache_key_to_string(const CACHE_KEY& key); inline bool operator == (const CACHE_KEY& lhs, const CACHE_KEY& rhs) diff --git a/server/modules/filter/cache/cachemt.cc b/server/modules/filter/cache/cachemt.cc index 9980ded57..2a2d8c8f5 100644 --- a/server/modules/filter/cache/cachemt.cc +++ b/server/modules/filter/cache/cachemt.cc @@ -17,7 +17,7 @@ #include "storagefactory.hh" using maxscale::SpinLockGuard; -using std::tr1::shared_ptr; +using std::shared_ptr; CacheMT::CacheMT(const std::string& name, const CACHE_CONFIG* pConfig, diff --git a/server/modules/filter/cache/cachept.cc b/server/modules/filter/cache/cachept.cc index eccd8ba11..2d25eadf9 100644 --- a/server/modules/filter/cache/cachept.cc +++ b/server/modules/filter/cache/cachept.cc @@ -21,7 +21,7 @@ #include "cachest.hh" #include "storagefactory.hh" -using std::tr1::shared_ptr; +using std::shared_ptr; using std::string; namespace diff --git a/server/modules/filter/cache/cachept.hh b/server/modules/filter/cache/cachept.hh index 9541618cd..b0bb8b48c 100644 --- a/server/modules/filter/cache/cachept.hh +++ b/server/modules/filter/cache/cachept.hh @@ -13,7 +13,7 @@ */ #include -#include +#include #include #include "cache.hh" @@ -41,7 +41,7 @@ public: cache_result_t del_value(const CACHE_KEY& key); private: - typedef std::tr1::shared_ptr SCache; + typedef std::shared_ptr SCache; typedef std::vector Caches; CachePT(const std::string& name, diff --git a/server/modules/filter/cache/cachesimple.hh b/server/modules/filter/cache/cachesimple.hh index d3b4e838c..dda13235d 100644 --- a/server/modules/filter/cache/cachesimple.hh +++ b/server/modules/filter/cache/cachesimple.hh @@ -13,7 +13,7 @@ */ #include -#include +#include #include "cache.hh" #include "cache_storage_api.hh" @@ -55,7 +55,7 @@ private: CacheSimple& operator = (const CacheSimple&); protected: - typedef std::tr1::unordered_map Pending; + typedef std::unordered_map Pending; Pending m_pending; // Pending items; being fetched from the backend. Storage* m_pStorage; // The storage instance to use. diff --git a/server/modules/filter/cache/cachest.cc b/server/modules/filter/cache/cachest.cc index a96ff587e..7e67307f6 100644 --- a/server/modules/filter/cache/cachest.cc +++ b/server/modules/filter/cache/cachest.cc @@ -16,7 +16,7 @@ #include "storage.hh" #include "storagefactory.hh" -using std::tr1::shared_ptr; +using std::shared_ptr; CacheST::CacheST(const std::string& name, const CACHE_CONFIG* pConfig, diff --git a/server/modules/filter/cache/lrustorage.hh b/server/modules/filter/cache/lrustorage.hh index 8fe45bcd2..d4734dc77 100644 --- a/server/modules/filter/cache/lrustorage.hh +++ b/server/modules/filter/cache/lrustorage.hh @@ -13,7 +13,7 @@ */ #include -#include +#include #include "cachefilter.h" #include "cache_storage_api.hh" #include "storage.hh" @@ -208,7 +208,7 @@ private: Node* m_pPrev; /*< The previous node in the LRU list. */ }; - typedef std::tr1::unordered_map NodesByKey; + typedef std::unordered_map NodesByKey; Node* vacate_lru(); Node* vacate_lru(size_t space); diff --git a/server/modules/filter/cache/rules.h b/server/modules/filter/cache/rules.h index c8c035727..c096468b3 100644 --- a/server/modules/filter/cache/rules.h +++ b/server/modules/filter/cache/rules.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -184,7 +184,7 @@ MXS_END_DECLS class CacheRules { public: - typedef std::tr1::shared_ptr SCacheRules; + typedef std::shared_ptr SCacheRules; CacheRules(const CacheRules&) = delete; CacheRules& operator = (const CacheRules&) = delete; diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh index 3d92aa677..907b28940 100644 --- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh +++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "../../cache_storage_api.hh" class InMemoryStorage @@ -92,7 +92,7 @@ private: uint64_t deletes; /*< How many times an existing key in the cache was deleted. */ }; - typedef std::tr1::unordered_map Entries; + typedef std::unordered_map Entries; std::string m_name; const CACHE_STORAGE_CONFIG m_config; diff --git a/server/modules/filter/cache/test/testkeygeneration.cc b/server/modules/filter/cache/test/testkeygeneration.cc index 861d61358..875e4540d 100644 --- a/server/modules/filter/cache/test/testkeygeneration.cc +++ b/server/modules/filter/cache/test/testkeygeneration.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -25,7 +25,6 @@ #include "tester.hh" using namespace std; -using namespace std::tr1; namespace { diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.hh b/server/modules/filter/dbfwfilter/dbfwfilter.hh index d5465e001..359ff54dd 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.hh +++ b/server/modules/filter/dbfwfilter/dbfwfilter.hh @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -154,7 +154,7 @@ struct QuerySpeed class Dbfw; class User; -typedef std::tr1::shared_ptr SUser; +typedef std::shared_ptr SUser; /** * The session structure for Firewall filter. @@ -279,7 +279,7 @@ typedef std::list ValueList; /** Temporary typedef for SRule */ class Rule; -typedef std::tr1::shared_ptr SRule; +typedef std::shared_ptr SRule; /** Helper function for strdup'ing in printf style */ char* create_error(const char* format, ...); diff --git a/server/modules/filter/dbfwfilter/rules.hh b/server/modules/filter/dbfwfilter/rules.hh index 55cbe6c53..6f0aa1dd5 100644 --- a/server/modules/filter/dbfwfilter/rules.hh +++ b/server/modules/filter/dbfwfilter/rules.hh @@ -296,5 +296,5 @@ private: mxs::Closer m_re; }; -typedef std::tr1::shared_ptr SRule; -typedef std::list RuleList; +typedef std::shared_ptr SRule; +typedef std::list RuleList; diff --git a/server/modules/filter/dbfwfilter/user.hh b/server/modules/filter/dbfwfilter/user.hh index d4c3483cd..c1dca944c 100644 --- a/server/modules/filter/dbfwfilter/user.hh +++ b/server/modules/filter/dbfwfilter/user.hh @@ -34,7 +34,7 @@ struct UserTemplate ValueList rulenames; /** Names of the rules */ }; -typedef std::tr1::shared_ptr SUserTemplate; +typedef std::shared_ptr SUserTemplate; typedef std::list TemplateList; /** @@ -101,5 +101,5 @@ private: GWBUF *queue, match_mode mode, char** rulename); }; -typedef std::tr1::shared_ptr SUser; -typedef std::tr1::unordered_map UserMap; +typedef std::shared_ptr SUser; +typedef std::unordered_map UserMap; diff --git a/server/modules/filter/masking/maskingfilter.cc b/server/modules/filter/masking/maskingfilter.cc index a52bfc299..1987f63ae 100644 --- a/server/modules/filter/masking/maskingfilter.cc +++ b/server/modules/filter/masking/maskingfilter.cc @@ -122,7 +122,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE() MaskingFilter::MaskingFilter(const Config& config, auto_ptr sRules) : m_config(config) - , m_sRules(sRules) + , m_sRules(sRules.release()) { MXS_NOTICE("Masking filter [%s] created.", m_config.name().c_str()); } @@ -171,7 +171,7 @@ uint64_t MaskingFilter::getCapabilities() return RCAP_TYPE_NONE; } -std::tr1::shared_ptr MaskingFilter::rules() const +std::shared_ptr MaskingFilter::rules() const { return m_sRules; } @@ -186,7 +186,7 @@ bool MaskingFilter::reload() MXS_NOTICE("Rules for masking filter '%s' were reloaded from '%s'.", m_config.name().c_str(), m_config.rules().c_str()); - m_sRules = sRules; + m_sRules.reset(sRules.release()); rval = true; } else diff --git a/server/modules/filter/masking/maskingfilter.hh b/server/modules/filter/masking/maskingfilter.hh index 62f3b1f6d..e600321e7 100644 --- a/server/modules/filter/masking/maskingfilter.hh +++ b/server/modules/filter/masking/maskingfilter.hh @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include "maskingfilterconfig.hh" #include "maskingfiltersession.hh" @@ -25,7 +25,7 @@ class MaskingRules; class MaskingFilter : public maxscale::Filter { public: - typedef std::tr1::shared_ptr SMaskingRules; + typedef std::shared_ptr SMaskingRules; typedef MaskingFilterConfig Config; ~MaskingFilter(); diff --git a/server/modules/filter/masking/maskingfiltersession.hh b/server/modules/filter/masking/maskingfiltersession.hh index 1ad6b6aa6..7231be42b 100644 --- a/server/modules/filter/masking/maskingfiltersession.hh +++ b/server/modules/filter/masking/maskingfiltersession.hh @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include "maskingrules.hh" @@ -64,7 +64,7 @@ private: bool reject_if_function_used(GWBUF* pPacket); private: - typedef std::tr1::shared_ptr SMaskingRules; + typedef std::shared_ptr SMaskingRules; class ResponseState { diff --git a/server/modules/filter/masking/maskingrules.cc b/server/modules/filter/masking/maskingrules.cc index c1c10e8df..a8d52db0c 100644 --- a/server/modules/filter/masking/maskingrules.cc +++ b/server/modules/filter/masking/maskingrules.cc @@ -27,7 +27,7 @@ using std::auto_ptr; using std::string; using std::vector; -using std::tr1::shared_ptr; +using std::shared_ptr; using maxscale::Closer; namespace diff --git a/server/modules/filter/masking/maskingrules.hh b/server/modules/filter/masking/maskingrules.hh index f4a4efc47..43d273e17 100644 --- a/server/modules/filter/masking/maskingrules.hh +++ b/server/modules/filter/masking/maskingrules.hh @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -67,7 +67,7 @@ public: virtual bool matches(const char* zUser, const char* zHost) const = 0; }; - typedef std::tr1::shared_ptr SAccount; + typedef std::shared_ptr SAccount; /** * Constructor of base Rule class @@ -394,7 +394,7 @@ public: const char* zUser, const char* zHost) const; - typedef std::tr1::shared_ptr SRule; + typedef std::shared_ptr SRule; private: MaskingRules(json_t* pRoot, const std::vector& rules); diff --git a/server/modules/filter/masking/test/testrules.cc b/server/modules/filter/masking/test/testrules.cc index 30e578325..f0aa38e53 100644 --- a/server/modules/filter/masking/test/testrules.cc +++ b/server/modules/filter/masking/test/testrules.cc @@ -17,7 +17,6 @@ #include using namespace std; -using namespace std::tr1; const char valid_minimal[] = "{" @@ -253,7 +252,7 @@ public: { int rc = EXIT_SUCCESS; - using std::tr1::shared_ptr; + using std::shared_ptr; auto_ptr sRules = MaskingRules::parse(valid_users); ss_dassert(sRules.get()); diff --git a/server/modules/monitor/galeramon/galeramon.hh b/server/modules/monitor/galeramon/galeramon.hh index 4561c625e..5f55c4cca 100644 --- a/server/modules/monitor/galeramon/galeramon.hh +++ b/server/modules/monitor/galeramon/galeramon.hh @@ -18,7 +18,7 @@ #include -#include +#include #include @@ -34,7 +34,7 @@ struct GaleraNode std::string cluster_uuid; /**< Cluster UUID */ }; -typedef std::tr1::unordered_map NodeMap; +typedef std::unordered_map NodeMap; class GaleraMonitor : public maxscale::MonitorInstanceSimple { diff --git a/server/modules/monitor/mariadbmon/mariadbmon.hh b/server/modules/monitor/mariadbmon/mariadbmon.hh index f7b03c458..0057f6bdb 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.hh +++ b/server/modules/monitor/mariadbmon/mariadbmon.hh @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -29,11 +29,11 @@ extern const char * const CN_PROMOTION_SQL_FILE; extern const char * const CN_DEMOTION_SQL_FILE; // Map of base struct to MariaDBServer. Does not own the server objects. May not be needed at the end. -typedef std::tr1::unordered_map ServerInfoMap; +typedef std::unordered_map ServerInfoMap; // Map of server id:s to MariaDBServer. Useful when constructing the replication graph. -typedef std::tr1::unordered_map IdToServerMap; +typedef std::unordered_map IdToServerMap; // Map of cycle number to cycle members -typedef std::tr1::unordered_map CycleMap; +typedef std::unordered_map CycleMap; // MariaDB Monitor instance data class MariaDBMonitor : public maxscale::MonitorInstance diff --git a/server/modules/monitor/mariadbmon/mariadbserver.hh b/server/modules/monitor/mariadbmon/mariadbserver.hh index 24ff72420..a9a4fc0a1 100644 --- a/server/modules/monitor/mariadbmon/mariadbserver.hh +++ b/server/modules/monitor/mariadbmon/mariadbserver.hh @@ -464,7 +464,7 @@ public: private: MYSQL_RES* m_resultset; // Underlying result set, freed at dtor. - std::tr1::unordered_map m_col_indexes; // Map of column name -> index + std::unordered_map m_col_indexes; // Map of column name -> index int64_t m_columns; // How many columns does the data have. Usually equal to column index map size. MYSQL_ROW m_rowdata; // Data for current row int64_t m_current_row; // Index of current row diff --git a/server/modules/routing/avrorouter/avro_converter.hh b/server/modules/routing/avrorouter/avro_converter.hh index 2c886fd18..73cafaa13 100644 --- a/server/modules/routing/avrorouter/avro_converter.hh +++ b/server/modules/routing/avrorouter/avro_converter.hh @@ -39,8 +39,8 @@ struct AvroTable avro_schema_t avro_schema; /*< Native Avro schema of the table */ }; -typedef std::tr1::shared_ptr SAvroTable; -typedef std::tr1::unordered_map AvroTables; +typedef std::shared_ptr SAvroTable; +typedef std::unordered_map AvroTables; // Converts replicated events into CDC events class AvroConverter : public RowEventHandler diff --git a/server/modules/routing/avrorouter/rpl.hh b/server/modules/routing/avrorouter/rpl.hh index d2833fadb..80c005d85 100644 --- a/server/modules/routing/avrorouter/rpl.hh +++ b/server/modules/routing/avrorouter/rpl.hh @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -72,7 +72,7 @@ struct Column }; struct TableCreateEvent; -typedef std::tr1::shared_ptr STableCreateEvent; +typedef std::shared_ptr STableCreateEvent; /** A CREATE TABLE abstraction */ struct TableCreateEvent @@ -151,12 +151,12 @@ struct TableMapEvent Bytes column_metadata; }; -typedef std::tr1::shared_ptr STableMapEvent; +typedef std::shared_ptr STableMapEvent; // Containers for the replication events -typedef std::tr1::unordered_map CreatedTables; -typedef std::tr1::unordered_map MappedTables; -typedef std::tr1::unordered_map ActiveMaps; +typedef std::unordered_map CreatedTables; +typedef std::unordered_map MappedTables; +typedef std::unordered_map ActiveMaps; // Handler class for row based replication events class RowEventHandler diff --git a/server/modules/routing/hintrouter/dcb.hh b/server/modules/routing/hintrouter/dcb.hh index 3a8c02a76..4f1d7fe23 100644 --- a/server/modules/routing/hintrouter/dcb.hh +++ b/server/modules/routing/hintrouter/dcb.hh @@ -14,14 +14,14 @@ #include "hintrouterdefs.hh" -#include +#include #include class Dcb { public: - typedef std::tr1::shared_ptr SDCB; + typedef std::shared_ptr SDCB; explicit Dcb(DCB* pDcb); diff --git a/server/modules/routing/hintrouter/hintroutersession.hh b/server/modules/routing/hintrouter/hintroutersession.hh index cadd6e581..2fd4fe6e6 100644 --- a/server/modules/routing/hintrouter/hintroutersession.hh +++ b/server/modules/routing/hintrouter/hintroutersession.hh @@ -15,7 +15,7 @@ #include "hintrouterdefs.hh" #include -#include +#include #include #include @@ -29,7 +29,7 @@ class HintRouter; class HintRouterSession : public maxscale::RouterSession { public: - typedef std::tr1::unordered_map BackendMap; // All backends, indexed by name + typedef std::unordered_map BackendMap; // All backends, indexed by name typedef std::vector BackendArray; typedef std::vector RefArray; typedef BackendMap::value_type MapElement; diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh index a86e78c0d..4d93149e6 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.hh +++ b/server/modules/routing/readwritesplit/readwritesplit.hh @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include #include #include @@ -200,7 +200,7 @@ struct Config bool optimistic_trx; /**< Enable optimistic transactions */ }; -typedef std::tr1::shared_ptr SConfig; +typedef std::shared_ptr SConfig; /** * The statistics for this router instance diff --git a/server/modules/routing/readwritesplit/rwbackend.hh b/server/modules/routing/readwritesplit/rwbackend.hh index 61b210566..785322e69 100644 --- a/server/modules/routing/readwritesplit/rwbackend.hh +++ b/server/modules/routing/readwritesplit/rwbackend.hh @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -35,7 +35,7 @@ enum reply_state_t typedef std::map BackendHandleMap; /** Internal ID to external ID */ class RWBackend; -typedef std::tr1::shared_ptr SRWBackend; +typedef std::shared_ptr SRWBackend; typedef std::list SRWBackendList; class RWBackend: public mxs::Backend diff --git a/server/modules/routing/readwritesplit/rwsplitsession.hh b/server/modules/routing/readwritesplit/rwsplitsession.hh index a07cbc92b..d1836f58d 100644 --- a/server/modules/routing/readwritesplit/rwsplitsession.hh +++ b/server/modules/routing/readwritesplit/rwsplitsession.hh @@ -30,14 +30,14 @@ typedef std::map ClientHandleMap; /** External ID to internal ID */ -typedef std::tr1::unordered_set TableSet; +typedef std::unordered_set TableSet; typedef std::map ResponseMap; /** List of slave responses that arrived before the master */ typedef std::list< std::pair > SlaveResponseList; /** Map of COM_STMT_EXECUTE targets by internal ID */ -typedef std::tr1::unordered_map ExecMap; +typedef std::unordered_map ExecMap; /** * The client session of a RWSplit instance diff --git a/server/modules/routing/schemarouter/schemarouter.hh b/server/modules/routing/schemarouter/schemarouter.hh index 0f633cfa3..98e294626 100644 --- a/server/modules/routing/schemarouter/schemarouter.hh +++ b/server/modules/routing/schemarouter/schemarouter.hh @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -128,7 +128,7 @@ private: bool m_mapped; /**< Whether the backend has been mapped */ }; -typedef std::tr1::shared_ptr SSRBackend; +typedef std::shared_ptr SSRBackend; typedef std::list SSRBackendList; } diff --git a/server/modules/routing/schemarouter/shard_map.hh b/server/modules/routing/schemarouter/shard_map.hh index 23b94a220..7842f10e1 100644 --- a/server/modules/routing/schemarouter/shard_map.hh +++ b/server/modules/routing/schemarouter/shard_map.hh @@ -14,7 +14,7 @@ #include -#include +#include #include #include @@ -24,7 +24,7 @@ using namespace maxscale; /** This contains the database to server mapping */ -typedef std::tr1::unordered_map ServerMap; +typedef std::unordered_map ServerMap; class Shard { @@ -96,7 +96,7 @@ private: time_t m_last_updated; }; -typedef std::tr1::unordered_map ShardMap; +typedef std::unordered_map ShardMap; class ShardManager {