Change typedef to using.

Conflicts:
	src/ripple/app/TODO.md
	src/ripple/app/ledger/Ledger.h
	src/ripple/protocol/Protocol.h
This commit is contained in:
Howard Hinnant
2015-05-21 19:12:10 -04:00
committed by Vinnie Falco
parent 52f298f150
commit 155fcdbcd0
224 changed files with 790 additions and 844 deletions

View File

@@ -36,14 +36,14 @@
class AutoSocket
{
public:
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> ssl_socket;
typedef boost::asio::ip::tcp::socket::endpoint_type endpoint_type;
typedef std::shared_ptr<ssl_socket> socket_ptr;
typedef ssl_socket::next_layer_type plain_socket;
typedef ssl_socket::lowest_layer_type lowest_layer_type;
typedef ssl_socket::handshake_type handshake_type;
typedef boost::system::error_code error_code;
typedef std::function <void (error_code)> callback;
using ssl_socket = boost::asio::ssl::stream<boost::asio::ip::tcp::socket>;
using endpoint_type = boost::asio::ip::tcp::socket::endpoint_type;
using socket_ptr = std::shared_ptr<ssl_socket>;
using plain_socket = ssl_socket::next_layer_type;
using lowest_layer_type = ssl_socket::lowest_layer_type;
using handshake_type = ssl_socket::handshake_type;
using error_code = boost::system::error_code;
using callback = std::function <void (error_code)>;
public:
AutoSocket (boost::asio::io_service& s, boost::asio::ssl::context& c)

View File

@@ -37,35 +37,33 @@ namespace websocket {
using ConfigBase04 = websocketpp::config::core;
struct Config04 : ConfigBase04 {
typedef ConfigBase04 base;
typedef Config04 type;
typedef base::concurrency_type concurrency_type;
using base = ConfigBase04;
using type = Config04;
using concurrency_type = base::concurrency_type;
typedef base::request_type request_type;
typedef base::response_type response_type;
using request_type = base::request_type;
using response_type = base::response_type;
typedef base::message_type message_type;
typedef base::con_msg_manager_type con_msg_manager_type;
typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
using message_type = base::message_type;
using con_msg_manager_type = base::con_msg_manager_type;
using endpoint_msg_manager_type = base::endpoint_msg_manager_type;
typedef Logger <LoggerType::access> alog_type;
typedef Logger <LoggerType::error> elog_type;
using alog_type = Logger <LoggerType::access>;
using elog_type = Logger <LoggerType::error>;
typedef base::rng_type rng_type;
using rng_type = base::rng_type;
struct transport_config : public base::transport_config {
typedef type::concurrency_type concurrency_type;
typedef type::alog_type alog_type;
typedef type::elog_type elog_type;
typedef type::request_type request_type;
typedef type::response_type response_type;
// typedef AutoSocket<con_type, std::error_code>
typedef websocketpp::transport::asio::basic_socket::endpoint
socket_type;
using concurrency_type = type::concurrency_type;
using alog_type = type::alog_type;
using elog_type = type::elog_type;
using request_type = type::request_type;
using response_type = type::response_type;
using socket_type = websocketpp::transport::asio::basic_socket::endpoint;
};
typedef websocketpp::transport::asio::endpoint<transport_config>
transport_type;
using transport_type = websocketpp::transport::asio::endpoint<transport_config>
;
};
} // websocket

View File

@@ -63,7 +63,7 @@ class HandlerImpl
public:
using connection_ptr = typename WebSocket::ConnectionPtr;
using message_ptr = typename WebSocket::MessagePtr;
using wsc_ptr = std::shared_ptr <ConnectionImpl <WebSocket> > ;
using wsc_ptr = std::shared_ptr <ConnectionImpl <WebSocket> >;
// Private reasons to close.
enum
@@ -83,7 +83,7 @@ protected:
std::mutex mLock;
// For each connection maintain an associated object to track subscriptions.
typedef hash_map <connection_ptr, wsc_ptr> MapType;
using MapType = hash_map <connection_ptr, wsc_ptr>;
MapType mMap;
public: