Skip to content

Commit

Permalink
detab entire project references XRPLF#376
Browse files Browse the repository at this point in the history
  • Loading branch information
zaphoyd committed Oct 6, 2014
1 parent 71a10d8 commit 6c242b2
Show file tree
Hide file tree
Showing 35 changed files with 1,214 additions and 1,214 deletions.
10 changes: 5 additions & 5 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ env.Append(CPPPATH = ['#'])

##### Set up C++11 environment
polyfill_libs = [] # boost libraries used as drop in replacements for incomplete
# C++11 STL implementations
# C++11 STL implementations
env_cpp11 = env.Clone ()

if env_cpp11['CXX'].startswith('g++'):
Expand Down Expand Up @@ -165,18 +165,18 @@ else:
# values then use it for the boost libraries. Otherwise just add them to the
# regular CPPPATH values.
if env['CXX'].startswith('g++') or env['CXX'].startswith('clang'):
env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
else:
env.Append(CPPPATH = [env['BOOST_INCLUDES']])
env.Append(CPPPATH = [env['BOOST_INCLUDES']])
env.Append(LIBPATH = [env['BOOST_LIBS']])

# if the build system is known to allow the isystem modifier for library include
# values then use it for the boost libraries. Otherwise just add them to the
# regular CPPPATH values.
if env_cpp11['CXX'].startswith('g++') or env_cpp11['CXX'].startswith('clang'):
env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
else:
env_cpp11.Append(CPPPATH = [env_cpp11['BOOST_INCLUDES']])
env_cpp11.Append(CPPPATH = [env_cpp11['BOOST_INCLUDES']])
env_cpp11.Append(LIBPATH = [env_cpp11['BOOST_LIBS']])

releasedir = 'build/release/'
Expand Down
2 changes: 1 addition & 1 deletion docs/simple_broadcast_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class broadcast_server {

void run(uint16_t port) {
m_server.listen(port);
m_server.start_accept();
m_server.start_accept();
m_server.run();
}
private:
Expand Down
2 changes: 1 addition & 1 deletion docs/simple_count_server_thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class count_server {

void run(uint16_t port) {
m_server.listen(port);
m_server.start_accept();
m_server.start_accept();
m_server.run();
}
private:
Expand Down
24 changes: 12 additions & 12 deletions examples/broadcast_server/broadcast_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ class broadcast_server {
m_server.listen(port);

// Start the server accept loop
m_server.start_accept();
m_server.start_accept();

// Start the ASIO io_service run loop
// Start the ASIO io_service run loop
try {
m_server.run();
} catch (const std::exception & e) {
Expand Down Expand Up @@ -142,18 +142,18 @@ class broadcast_server {
};

int main() {
try {
broadcast_server server_instance;
try {
broadcast_server server_instance;

// Start a thread to run the processing loop
thread t(bind(&broadcast_server::process_messages,&server_instance));
// Start a thread to run the processing loop
thread t(bind(&broadcast_server::process_messages,&server_instance));

// Run the asio loop with the main thread
server_instance.run(9002);
// Run the asio loop with the main thread
server_instance.run(9002);

t.join();
t.join();

} catch (std::exception & e) {
std::cout << e.what() << std::endl;
}
} catch (std::exception & e) {
std::cout << e.what() << std::endl;
}
}
16 changes: 8 additions & 8 deletions examples/debug_client/debug_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ class perftest {
client::connection_ptr con = m_endpoint.get_connection(uri, ec);

if (ec) {
m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
}

//con->set_proxy("http://humupdates.uchicago.edu:8443");

m_endpoint.connect(con);

// Start the ASIO io_service run loop
m_start = std::chrono::high_resolution_clock::now();
// Start the ASIO io_service run loop
m_start = std::chrono::high_resolution_clock::now();
m_endpoint.run();
}

Expand Down Expand Up @@ -133,13 +133,13 @@ class perftest {
};

int main(int argc, char* argv[]) {
std::string uri = "wss://echo.websocket.org";
std::string uri = "wss://echo.websocket.org";

if (argc == 2) {
uri = argv[1];
}
if (argc == 2) {
uri = argv[1];
}

try {
try {
perftest endpoint;
endpoint.start(uri);
} catch (const std::exception & e) {
Expand Down
6 changes: 3 additions & 3 deletions examples/debug_server/debug_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
}

int main() {
// Create a server endpoint
// Create a server endpoint
server echo_server;

try {
try {
// Set logging settings
echo_server.set_access_channels(websocketpp::log::alevel::all);
echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
Expand All @@ -80,7 +80,7 @@ int main() {
// Start the server accept loop
echo_server.start_accept();

// Start the ASIO io_service run loop
// Start the ASIO io_service run loop
echo_server.run();
} catch (const std::exception & e) {
std::cout << e.what() << std::endl;
Expand Down
Loading

0 comments on commit 6c242b2

Please sign in to comment.