From f1522b8fef7a558ad88a3a5a52e985c3d4809fed Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 5 Sep 2013 06:55:50 -0700 Subject: [PATCH] Fix using-statements for older gcc without c++11 --- modules/ripple_core/test/ConnectionType.h | 7 ++++--- modules/ripple_core/test/MessageType.h | 2 +- modules/ripple_core/test/NetworkType.h | 6 +++--- modules/ripple_core/test/PeerLogicBase.h | 6 +++--- modules/ripple_core/test/PeerType.h | 18 ++++++++++-------- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/modules/ripple_core/test/ConnectionType.h b/modules/ripple_core/test/ConnectionType.h index d81e6eae1..1013a6ef7 100644 --- a/modules/ripple_core/test/ConnectionType.h +++ b/modules/ripple_core/test/ConnectionType.h @@ -15,11 +15,12 @@ template class ConnectionType : public Config { public: - using typename Config::Peer; - using typename Config::Message; + typedef typename Config::Peer Peer; + typedef typename Config::Message Message; + typedef typename Config::State State; + typedef typename State::UniqueID UniqueID; typedef std::vector Messages; - typedef typename Config::State::UniqueID UniqueID; typedef boost::unordered_set MessageTable; /** Create the 'no connection' object. */ diff --git a/modules/ripple_core/test/MessageType.h b/modules/ripple_core/test/MessageType.h index c724c5d6d..61f2ee971 100644 --- a/modules/ripple_core/test/MessageType.h +++ b/modules/ripple_core/test/MessageType.h @@ -16,7 +16,7 @@ class MessageType : public Config { public: typedef typename Config::State::UniqueID UniqueID; - using typename Config::Payload; + typedef typename Config::Payload Payload; MessageType () : m_id (0) diff --git a/modules/ripple_core/test/NetworkType.h b/modules/ripple_core/test/NetworkType.h index a92e3b678..afd6fc06a 100644 --- a/modules/ripple_core/test/NetworkType.h +++ b/modules/ripple_core/test/NetworkType.h @@ -16,9 +16,9 @@ class NetworkType : public ConfigParam public: typedef ConfigParam Config; - using typename Config::SizeType; - using typename Config::State; - using typename Config::Peer; + typedef typename Config::Peer Peer; + typedef typename Config::State State; + typedef typename Config::SizeType SizeType; typedef std::vector > Peers; diff --git a/modules/ripple_core/test/PeerLogicBase.h b/modules/ripple_core/test/PeerLogicBase.h index bfed1fce8..f56fbe183 100644 --- a/modules/ripple_core/test/PeerLogicBase.h +++ b/modules/ripple_core/test/PeerLogicBase.h @@ -18,9 +18,9 @@ template class PeerLogicBase : public Config { public: - typedef typename Config::Peer Peer; - typedef typename Peer::Connection Connection; - typedef typename Connection::Message Message; + typedef typename Config::Peer Peer; + typedef typename Peer::Connection Connection; + typedef typename Connection::Message Message; explicit PeerLogicBase (Peer& peer) : m_peer (peer) diff --git a/modules/ripple_core/test/PeerType.h b/modules/ripple_core/test/PeerType.h index 99023ca07..2e704ce67 100644 --- a/modules/ripple_core/test/PeerType.h +++ b/modules/ripple_core/test/PeerType.h @@ -17,14 +17,16 @@ class PeerType , public Uncopyable { public: - using typename Config::Peer; - using typename Config::Payload; - using typename Config::PeerLogic; - using typename Config::Message; - using typename Config::Network; - typedef typename Config::State::UniqueID UniqueID; - typedef ConnectionType Connection; - typedef std::vector Connections; + typedef typename Config::Peer Peer; + typedef typename Config::Payload Payload; + typedef typename Config::PeerLogic PeerLogic; + typedef typename Config::Message Message; + typedef typename Config::Network Network; + typedef typename Config::State State; + typedef typename State::UniqueID UniqueID; + typedef ConnectionType Connection; + typedef std::vector Connections; + typedef boost::unordered_set MessageTable; explicit PeerType (Network& network)