Fix using-statements for older gcc without c++11

This commit is contained in:
Vinnie Falco
2013-09-05 06:55:50 -07:00
parent 4819714edf
commit f1522b8fef
5 changed files with 21 additions and 18 deletions

View File

@@ -15,11 +15,12 @@ template <class Config>
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 <Message> Messages;
typedef typename Config::State::UniqueID UniqueID;
typedef boost::unordered_set <UniqueID> MessageTable;
/** Create the 'no connection' object. */

View File

@@ -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)

View File

@@ -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 <ScopedPointer <Peer> > Peers;

View File

@@ -18,9 +18,9 @@ template <class Config>
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)

View File

@@ -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 <Config> Connection;
typedef std::vector <Connection> 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 <Config> Connection;
typedef std::vector <Connection> Connections;
typedef boost::unordered_set <UniqueID> MessageTable;
explicit PeerType (Network& network)