diff --git a/.gitignore b/.gitignore index d43dd732a7..a0d566c4fd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,8 @@ objs_static/ examples/chat_server/chat_server examples/echo_server/echo_server examples/chat_client/chat_client +examples/echo_client/echo_client test/basic/tests libwebsocketpp.dylib.0.1.0 websocketpp.xcodeproj/xcuserdata/* -examples/echo_client/echo_client diff --git a/examples/chat_client/chat_client.cpp b/examples/chat_client/chat_client.cpp index a7529998ff..7223dad92a 100644 --- a/examples/chat_client/chat_client.cpp +++ b/examples/chat_client/chat_client.cpp @@ -27,7 +27,7 @@ #include "chat_client_handler.hpp" -#include +#include "../../src/websocketpp.hpp" #include #include #include diff --git a/src/websocket_client.cpp b/src/websocket_client.cpp index a1e5eef347..69bdd1f89f 100644 --- a/src/websocket_client.cpp +++ b/src/websocket_client.cpp @@ -35,7 +35,8 @@ using websocketpp::client; using boost::asio::ip::tcp; -client::client(boost::asio::io_service& io_service,connection_handler_ptr defc) +client::client(boost::asio::io_service& io_service, + websocketpp::connection_handler_ptr defc) : m_elog_level(LOG_ALL), m_alog_level(ALOG_ALL), m_state(CLIENT_STATE_NULL), @@ -128,7 +129,7 @@ void client::set_elog_level(uint16_t level) { m_elog_level = level; } bool client::test_alog_level(uint16_t level) { - return (level & m_alog_level); + return ((level & m_alog_level) != 0); } void client::set_alog_level(uint16_t level) { if (test_alog_level(level)) { diff --git a/src/websocket_client_session.cpp b/src/websocket_client_session.cpp index 83c4064b6c..456a01e505 100644 --- a/src/websocket_client_session.cpp +++ b/src/websocket_client_session.cpp @@ -45,9 +45,9 @@ using websocketpp::client_session; -client_session::client_session (client_ptr c, +client_session::client_session (websocketpp::client_ptr c, boost::asio::io_service& io_service, - connection_handler_ptr defc) + websocketpp::connection_handler_ptr defc) : session(io_service,defc),m_client(c) {} void client_session::on_connect() { diff --git a/src/websocket_client_session.hpp b/src/websocket_client_session.hpp index f55b29fa08..510f02cd66 100644 --- a/src/websocket_client_session.hpp +++ b/src/websocket_client_session.hpp @@ -34,7 +34,11 @@ #include #include +#if defined(WIN32) +#include +#else #include +#endif #include #include diff --git a/src/websocket_frame.cpp b/src/websocket_frame.cpp index db46ff29ea..6be794f501 100644 --- a/src/websocket_frame.cpp +++ b/src/websocket_frame.cpp @@ -33,7 +33,11 @@ #include #include +#if defined(WIN32) +#include +#else #include +#endif using websocketpp::frame; diff --git a/src/websocket_server.cpp b/src/websocket_server.cpp index 984a1c8441..c098e77ad3 100644 --- a/src/websocket_server.cpp +++ b/src/websocket_server.cpp @@ -36,7 +36,7 @@ using websocketpp::server; server::server(boost::asio::io_service& io_service, const tcp::endpoint& endpoint, - connection_handler_ptr defc) + websocketpp::connection_handler_ptr defc) : m_elog_level(LOG_ALL), m_alog_level(ALOG_ALL), m_max_message_size(DEFAULT_MAX_MESSAGE_SIZE), @@ -81,7 +81,7 @@ void server::set_elog_level(uint16_t level) { m_elog_level = level; } bool server::test_alog_level(uint16_t level) { - return (level & m_alog_level); + return ((level & m_alog_level) != 0); } void server::set_alog_level(uint16_t level) { if (test_alog_level(level)) { @@ -153,7 +153,7 @@ void server::start_accept() { ); } -void server::handle_accept(server_session_ptr session, +void server::handle_accept(websocketpp::server_session_ptr session, const boost::system::error_code& error) { if (!error) { diff --git a/src/websocket_server_session.cpp b/src/websocket_server_session.cpp index b1015c7bde..1213fb8eca 100644 --- a/src/websocket_server_session.cpp +++ b/src/websocket_server_session.cpp @@ -43,9 +43,9 @@ using websocketpp::server_session; -server_session::server_session(server_ptr s, +server_session::server_session(websocketpp::server_ptr s, boost::asio::io_service& io_service, - connection_handler_ptr defc) + websocketpp::connection_handler_ptr defc) : session(io_service,defc),m_server(s) {} void server_session::on_connect() { diff --git a/src/websocket_server_session.hpp b/src/websocket_server_session.hpp index 73b9ed59cd..0fd93bd8c9 100644 --- a/src/websocket_server_session.hpp +++ b/src/websocket_server_session.hpp @@ -34,7 +34,11 @@ #include #include +#if defined(WIN32) +#include +#else #include +#endif #include #include diff --git a/src/websocket_session.cpp b/src/websocket_session.cpp index d13b3b5ad3..9ebf2a9a8d 100644 --- a/src/websocket_session.cpp +++ b/src/websocket_session.cpp @@ -44,7 +44,7 @@ using websocketpp::session; session::session (boost::asio::io_service& io_service, - connection_handler_ptr defc) + websocketpp::connection_handler_ptr defc) : m_status(CONNECTING), m_local_close_code(CLOSE_STATUS_NO_STATUS), m_remote_close_code(CLOSE_STATUS_NO_STATUS), @@ -67,7 +67,7 @@ boost::asio::io_service& session::io_service() { return m_io_service; } -void session::set_handler(connection_handler_ptr new_con) { +void session::set_handler(websocketpp::connection_handler_ptr new_con) { if (m_local_interface) { // TODO: this should be another method and not reusing onclose //m_local_interface->disconnect(shared_from_this(),4000,"Setting new connection handler"); @@ -101,7 +101,7 @@ std::string session::get_server_header(const std::string& key) const { } std::string session::get_header(const std::string& key, - const header_list& list) const { + const websocketpp::header_list& list) const { header_list::const_iterator h = list.find(key); if (h == list.end()) { diff --git a/src/websocket_session.hpp b/src/websocket_session.hpp index 19e33cb8fd..c6a4847d6a 100644 --- a/src/websocket_session.hpp +++ b/src/websocket_session.hpp @@ -34,7 +34,11 @@ #include #include +#if defined(WIN32) +#include +#else #include +#endif #include #include @@ -140,14 +144,15 @@ public: void disconnect(uint16_t status,const std::string& reason); // temp virtual bool is_server() const = 0; -protected: + // Opening handshake processors and callbacks. These need to be defined in // derived classes. - virtual void write_handshake() = 0; virtual void handle_write_handshake(const boost::system::error_code& e) = 0; - virtual void read_handshake() = 0; virtual void handle_read_handshake(const boost::system::error_code& e, std::size_t bytes_transferred) = 0; +protected: + virtual void write_handshake() = 0; + virtual void read_handshake() = 0; // start async read for a websocket frame (2 bytes) to handle_frame_header void read_frame(); diff --git a/websocketpp.xcodeproj/project.xcworkspace/xcuserdata/zaphoyd.xcuserdatad/UserInterfaceState.xcuserstate b/websocketpp.xcodeproj/project.xcworkspace/xcuserdata/zaphoyd.xcuserdatad/UserInterfaceState.xcuserstate index 1e5d07d1dd..a8b7ed386d 100644 --- a/websocketpp.xcodeproj/project.xcworkspace/xcuserdata/zaphoyd.xcuserdatad/UserInterfaceState.xcuserstate +++ b/websocketpp.xcodeproj/project.xcworkspace/xcuserdata/zaphoyd.xcuserdatad/UserInterfaceState.xcuserstate @@ -11,7 +11,7 @@ $class CF$UID - 354 + 359 NS.keys @@ -32,7 +32,7 @@ CF$UID - 472 + 477 @@ -105,29 +105,29 @@ CF$UID 129 - - CF$UID - 404 - CF$UID 409 CF$UID - 412 + 414 CF$UID - 443 + 417 CF$UID - 444 + 448 CF$UID - 451 + 449 + + + CF$UID + 456 CF$UID @@ -208,15 +208,15 @@ CF$UID - 323 + 328 CF$UID - 330 + 335 CF$UID - 336 + 341 @@ -2293,120 +2293,128 @@ CF$UID 216 + + CF$UID + 218 + NS.objects CF$UID - 218 + 220 CF$UID - 223 + 225 CF$UID - 230 + 232 CF$UID - 233 + 235 CF$UID - 236 + 238 CF$UID - 240 + 242 CF$UID - 244 + 246 CF$UID - 248 + 250 CF$UID - 252 + 254 CF$UID - 256 + 258 CF$UID - 260 + 262 CF$UID - 263 + 265 CF$UID - 267 + 269 CF$UID - 270 + 272 CF$UID - 274 + 276 CF$UID - 278 + 280 CF$UID - 282 + 284 CF$UID - 286 + 288 CF$UID - 290 + 292 CF$UID - 293 + 295 CF$UID - 297 + 298 CF$UID - 300 + 302 CF$UID - 303 + 305 CF$UID - 306 + 308 CF$UID - 310 + 311 CF$UID - 313 + 315 CF$UID - 316 + 318 CF$UID - 320 + 321 + + + CF$UID + 325 @@ -2928,7 +2936,7 @@ 115 NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/usr/include/stdlib.h + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.hpp $class @@ -2954,7 +2962,7 @@ 115 NS.string - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp + file://localhost/Developer/SDKs/MacOSX10.7.sdk/usr/include/stdlib.h $class @@ -2980,7 +2988,7 @@ 115 NS.string - file://localhost/Users/zaphoyd/Documents/websocketpp/src/base64/base64.cpp + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp $class @@ -3006,7 +3014,7 @@ 115 NS.string - file://localhost/Users/zaphoyd/Documents/websocketpp/Makefile + file://localhost/Users/zaphoyd/Documents/websocketpp/src/base64/base64.cpp $class @@ -3032,7 +3040,7 @@ 115 NS.string - file://localhost/usr/local/include/boost/regex/v4/basic_regex_creator.hpp + file://localhost/Users/zaphoyd/Documents/websocketpp/Makefile $class @@ -3058,7 +3066,7 @@ 115 NS.string - file://localhost/usr/local/include/boost/asio/detail/impl/pipe_select_interrupter.ipp + file://localhost/usr/local/include/boost/regex/v4/basic_regex_creator.hpp $class @@ -3084,7 +3092,7 @@ 115 NS.string - file://localhost/Users/zaphoyd/Documents/websocketpp/examples/echo_client/Makefile + file://localhost/usr/local/include/boost/asio/detail/impl/pipe_select_interrupter.ipp $class @@ -3110,7 +3118,7 @@ 115 NS.string - file://localhost/usr/local/include/boost/asio/detail/deadline_timer_service.hpp + file://localhost/Users/zaphoyd/Documents/websocketpp/examples/echo_client/Makefile $class @@ -3129,6 +3137,32 @@ 217 + + $class + + CF$UID + 115 + + NS.string + file://localhost/usr/local/include/boost/asio/detail/deadline_timer_service.hpp + + + $class + + CF$UID + 28 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 219 + + $class @@ -3156,7 +3190,7 @@ CF$UID - 219 + 221 CF$UID @@ -3167,11 +3201,11 @@ CF$UID - 220 + 222 CF$UID - 221 + 223 CF$UID @@ -3179,7 +3213,7 @@ CF$UID - 222 + 224 @@ -3195,14 +3229,6 @@ NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -3211,9 +3237,6 @@ CF$UID 227 - - NS.objects - CF$UID 228 @@ -3222,6 +3245,17 @@ CF$UID 229 + + NS.objects + + + CF$UID + 230 + + + CF$UID + 231 + CF$UID 16 @@ -3236,8 +3270,8 @@ PrimaryDocumentVisibleCharacterRange HideAllIssues PrimaryDocumentSelectedCharacterRange - 339336681.32342398 - {0, 2739} + 339337803.18501502 + {0, 2766} $class @@ -3246,14 +3280,6 @@ NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -3262,16 +3288,24 @@ CF$UID 227 + + CF$UID + 228 + + + CF$UID + 229 + NS.objects CF$UID - 231 + 233 CF$UID - 232 + 234 CF$UID @@ -3303,7 +3337,7 @@ CF$UID - 219 + 221 CF$UID @@ -3314,11 +3348,11 @@ CF$UID - 234 + 236 CF$UID - 235 + 237 CF$UID @@ -3350,7 +3384,7 @@ CF$UID - 219 + 221 CF$UID @@ -3361,11 +3395,11 @@ CF$UID - 237 + 239 CF$UID - 238 + 240 CF$UID @@ -3373,7 +3407,7 @@ CF$UID - 239 + 241 @@ -3398,7 +3432,7 @@ CF$UID - 219 + 221 CF$UID @@ -3409,11 +3443,11 @@ CF$UID - 241 + 243 CF$UID - 242 + 244 CF$UID @@ -3421,7 +3455,7 @@ CF$UID - 243 + 245 @@ -3446,7 +3480,7 @@ CF$UID - 219 + 221 CF$UID @@ -3457,11 +3491,11 @@ CF$UID - 245 + 247 CF$UID - 246 + 248 CF$UID @@ -3469,7 +3503,7 @@ CF$UID - 247 + 249 @@ -3494,7 +3528,7 @@ CF$UID - 219 + 221 CF$UID @@ -3505,11 +3539,11 @@ CF$UID - 249 + 251 CF$UID - 250 + 252 CF$UID @@ -3517,7 +3551,7 @@ CF$UID - 251 + 253 @@ -3542,7 +3576,7 @@ CF$UID - 219 + 221 CF$UID @@ -3553,11 +3587,11 @@ CF$UID - 253 + 255 CF$UID - 254 + 256 CF$UID @@ -3565,7 +3599,7 @@ CF$UID - 255 + 257 @@ -3590,7 +3624,7 @@ CF$UID - 219 + 221 CF$UID @@ -3601,11 +3635,11 @@ CF$UID - 257 + 259 CF$UID - 258 + 260 CF$UID @@ -3613,7 +3647,7 @@ CF$UID - 259 + 261 @@ -3628,14 +3662,6 @@ NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -3644,16 +3670,24 @@ CF$UID 227 + + CF$UID + 228 + + + CF$UID + 229 + NS.objects CF$UID - 261 + 263 CF$UID - 262 + 264 CF$UID @@ -3665,7 +3699,7 @@ - 339336676.30196899 + 339337781.777569 {0, 2939} $class @@ -3675,14 +3709,6 @@ NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -3691,16 +3717,24 @@ CF$UID 227 + + CF$UID + 228 + + + CF$UID + 229 + NS.objects CF$UID - 264 + 266 CF$UID - 265 + 267 CF$UID @@ -3708,7 +3742,7 @@ CF$UID - 266 + 268 @@ -3733,7 +3767,7 @@ CF$UID - 219 + 221 CF$UID @@ -3744,11 +3778,11 @@ CF$UID - 268 + 270 CF$UID - 269 + 271 CF$UID @@ -3780,7 +3814,7 @@ CF$UID - 219 + 221 CF$UID @@ -3791,11 +3825,11 @@ CF$UID - 271 + 273 CF$UID - 272 + 274 CF$UID @@ -3803,7 +3837,7 @@ CF$UID - 273 + 275 @@ -3828,7 +3862,7 @@ CF$UID - 219 + 221 CF$UID @@ -3839,11 +3873,11 @@ CF$UID - 275 + 277 CF$UID - 276 + 278 CF$UID @@ -3851,7 +3885,7 @@ CF$UID - 277 + 279 @@ -3876,7 +3910,7 @@ CF$UID - 219 + 221 CF$UID @@ -3887,11 +3921,11 @@ CF$UID - 279 + 281 CF$UID - 280 + 282 CF$UID @@ -3899,7 +3933,7 @@ CF$UID - 281 + 283 @@ -3924,7 +3958,7 @@ CF$UID - 219 + 221 CF$UID @@ -3935,11 +3969,11 @@ CF$UID - 283 + 285 CF$UID - 284 + 286 CF$UID @@ -3947,7 +3981,7 @@ CF$UID - 285 + 287 @@ -3972,7 +4006,7 @@ CF$UID - 219 + 221 CF$UID @@ -3983,11 +4017,11 @@ CF$UID - 287 + 289 CF$UID - 288 + 290 CF$UID @@ -3995,7 +4029,7 @@ CF$UID - 289 + 291 @@ -4020,7 +4054,7 @@ CF$UID - 219 + 221 CF$UID @@ -4031,11 +4065,11 @@ CF$UID - 291 + 293 CF$UID - 292 + 294 CF$UID @@ -4049,6 +4083,53 @@ 339164333.54790199 {0, 135} + + $class + + CF$UID + 65 + + NS.keys + + + CF$UID + 226 + + + CF$UID + 227 + + + CF$UID + 228 + + + CF$UID + 229 + + + NS.objects + + + CF$UID + 296 + + + CF$UID + 297 + + + CF$UID + 16 + + + CF$UID + 158 + + + + 339337834.27156699 + {0, 2617} $class @@ -4067,7 +4148,7 @@ CF$UID - 219 + 221 CF$UID @@ -4078,11 +4159,11 @@ CF$UID - 294 + 299 CF$UID - 295 + 300 CF$UID @@ -4090,7 +4171,7 @@ CF$UID - 296 + 301 @@ -4115,7 +4196,7 @@ CF$UID - 219 + 221 CF$UID @@ -4126,11 +4207,11 @@ CF$UID - 298 + 303 CF$UID - 299 + 304 CF$UID @@ -4162,7 +4243,7 @@ CF$UID - 219 + 221 CF$UID @@ -4173,11 +4254,11 @@ CF$UID - 301 + 306 CF$UID - 302 + 307 CF$UID @@ -4209,7 +4290,7 @@ CF$UID - 219 + 221 CF$UID @@ -4220,11 +4301,11 @@ CF$UID - 304 + 309 CF$UID - 305 + 310 CF$UID @@ -4256,7 +4337,7 @@ CF$UID - 219 + 221 CF$UID @@ -4267,11 +4348,11 @@ CF$UID - 307 + 312 CF$UID - 308 + 313 CF$UID @@ -4279,7 +4360,7 @@ CF$UID - 309 + 314 @@ -4304,7 +4385,7 @@ CF$UID - 219 + 221 CF$UID @@ -4315,11 +4396,11 @@ CF$UID - 311 + 316 CF$UID - 312 + 317 CF$UID @@ -4351,7 +4432,7 @@ CF$UID - 219 + 221 CF$UID @@ -4362,11 +4443,11 @@ CF$UID - 314 + 319 CF$UID - 315 + 320 CF$UID @@ -4398,7 +4479,7 @@ CF$UID - 219 + 221 CF$UID @@ -4409,11 +4490,11 @@ CF$UID - 317 + 322 CF$UID - 318 + 323 CF$UID @@ -4421,7 +4502,7 @@ CF$UID - 319 + 324 @@ -4446,7 +4527,7 @@ CF$UID - 219 + 221 CF$UID @@ -4457,11 +4538,11 @@ CF$UID - 321 + 326 CF$UID - 322 + 327 CF$UID @@ -4489,18 +4570,18 @@ CF$UID - 204 + 206 NS.objects CF$UID - 324 + 329 CF$UID - 327 + 332 @@ -4533,11 +4614,11 @@ CF$UID - 325 + 330 CF$UID - 326 + 331 @@ -4572,11 +4653,11 @@ CF$UID - 328 + 333 CF$UID - 329 + 334 @@ -4592,14 +4673,14 @@ CF$UID - 331 + 336 NS.objects CF$UID - 333 + 338 @@ -4617,7 +4698,7 @@ NS.relative CF$UID - 332 + 337 x-xcode-log://FFE7C9F6-5DFA-4BB4-B150-EFCFC8A1E4C2 @@ -4631,14 +4712,14 @@ CF$UID - 334 + 339 NS.objects CF$UID - 335 + 340 @@ -4654,14 +4735,14 @@ CF$UID - 337 + 342 NS.objects CF$UID - 339 + 344 @@ -4679,7 +4760,7 @@ NS.relative CF$UID - 338 + 343 @@ -4698,29 +4779,6 @@ 65 NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - NS.objects CF$UID @@ -4732,15 +4790,38 @@ CF$UID - 358 + 347 CF$UID - 359 + 348 CF$UID - 371 + 349 + + + NS.objects + + + CF$UID + 350 + + + CF$UID + 351 + + + CF$UID + 363 + + + CF$UID + 364 + + + CF$UID + 376 @@ -4760,14 +4841,14 @@ CF$UID - 347 + 352 NS.objects CF$UID - 348 + 353 @@ -4776,17 +4857,17 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 349 + 354 CF$UID - 355 + 360 @@ -4794,28 +4875,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 350 + 355 CF$UID - 351 + 356 NS.objects CF$UID - 352 + 357 CF$UID - 353 + 358 @@ -4836,28 +4917,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 350 + 355 CF$UID - 351 + 356 NS.objects CF$UID - 352 + 357 CF$UID - 356 + 361 @@ -4883,7 +4964,7 @@ CF$UID - 360 + 365 @@ -4891,22 +4972,22 @@ $class CF$UID - 370 + 375 documentURL CF$UID - 361 + 366 selection CF$UID - 363 + 368 timestamp CF$UID - 362 + 367 file://localhost/Users/zaphoyd/Documents/websocketpp/websocketpp.xcodeproj/ @@ -4921,30 +5002,30 @@ CF$UID - 364 + 369 CF$UID - 365 + 370 CF$UID - 366 + 371 NS.objects CF$UID - 358 + 363 CF$UID - 367 + 372 CF$UID - 368 + 373 @@ -4962,7 +5043,7 @@ CF$UID - 369 + 374 @@ -4995,26 +5076,6 @@ NS.keys - - CF$UID - 372 - - - CF$UID - 373 - - - CF$UID - 374 - - - CF$UID - 375 - - - CF$UID - 376 - CF$UID 377 @@ -5055,12 +5116,32 @@ CF$UID 386 + + CF$UID + 387 + + + CF$UID + 388 + + + CF$UID + 389 + + + CF$UID + 390 + + + CF$UID + 391 + NS.objects CF$UID - 387 + 392 CF$UID @@ -5068,27 +5149,7 @@ CF$UID - 352 - - - CF$UID - 392 - - - CF$UID - 393 - - - CF$UID - 394 - - - CF$UID - 395 - - - CF$UID - 396 + 357 CF$UID @@ -5118,6 +5179,26 @@ CF$UID 403 + + CF$UID + 404 + + + CF$UID + 405 + + + CF$UID + 406 + + + CF$UID + 407 + + + CF$UID + 408 + Xcode3BuildPhasesEditorDisclosedNamesKey2.0 @@ -5139,21 +5220,21 @@ $class CF$UID - 391 + 396 NS.objects CF$UID - 388 + 393 CF$UID - 389 + 394 CF$UID - 390 + 395 @@ -5312,22 +5393,22 @@ CF$UID - 405 + 410 CF$UID - 406 + 411 NS.objects CF$UID - 407 + 412 CF$UID - 408 + 413 @@ -5343,37 +5424,6 @@ NS.keys - - CF$UID - 410 - - - NS.objects - - - CF$UID - 411 - - - - IDENameString - echo_client - - $class - - CF$UID - 65 - - NS.keys - - - CF$UID - 413 - - - CF$UID - 414 - CF$UID 415 @@ -5385,45 +5435,10 @@ CF$UID 416 - - CF$UID - 441 - - - CF$UID - 442 - - - - IDEActivityReportCompletionSummaryStringSegments - IDEActivityReportOptions - IDEActivityReportTitle - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 417 - - - CF$UID - 424 - - - CF$UID - 427 - - - CF$UID - 431 - + IDENameString + echo_client $class @@ -5451,14 +5466,80 @@ CF$UID 421 + + CF$UID + 446 + + + CF$UID + 447 + + + + IDEActivityReportCompletionSummaryStringSegments + IDEActivityReportOptions + IDEActivityReportTitle + + $class + + CF$UID + 362 + + NS.objects + CF$UID 422 + + CF$UID + 429 + + + CF$UID + 432 + + + CF$UID + 436 + + + + + $class + + CF$UID + 65 + + NS.keys + CF$UID 423 + + CF$UID + 424 + + + CF$UID + 425 + + + NS.objects + + + CF$UID + 426 + + + CF$UID + 427 + + + CF$UID + 428 + IDEActivityReportStringSegmentPriority @@ -5477,30 +5558,30 @@ CF$UID - 418 + 423 CF$UID - 419 + 424 CF$UID - 420 + 425 NS.objects CF$UID - 425 + 430 CF$UID - 426 + 431 CF$UID - 367 + 372 @@ -5516,30 +5597,30 @@ CF$UID - 418 + 423 CF$UID - 419 + 424 CF$UID - 420 + 425 NS.objects CF$UID - 428 + 433 CF$UID - 429 + 434 CF$UID - 430 + 435 @@ -5581,34 +5662,7 @@ CF$UID - 418 - - - CF$UID - 432 - - - CF$UID - 433 - - - CF$UID - 420 - - - CF$UID - 434 - - - CF$UID - 435 - - - NS.objects - - - CF$UID - 436 + 423 CF$UID @@ -5618,17 +5672,44 @@ CF$UID 438 + + CF$UID + 425 + + + CF$UID + 439 + CF$UID 440 + + NS.objects + CF$UID - 437 + 441 CF$UID - 437 + 442 + + + CF$UID + 443 + + + CF$UID + 445 + + + CF$UID + 442 + + + CF$UID + 442 @@ -5642,7 +5723,7 @@ $class CF$UID - 439 + 444 NS.time 339200599.05993497 @@ -5663,7 +5744,7 @@ $class CF$UID - 357 + 362 NS.objects @@ -5683,14 +5764,14 @@ CF$UID - 445 + 450 NS.objects CF$UID - 446 + 451 @@ -5708,35 +5789,35 @@ NS.relative CF$UID - 361 + 366 $class CF$UID - 354 + 359 NS.keys CF$UID - 447 + 452 CF$UID - 448 + 453 NS.objects CF$UID - 449 + 454 CF$UID - 450 + 455 @@ -5748,49 +5829,49 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 452 + 457 CF$UID - 454 + 459 CF$UID - 456 + 461 CF$UID - 458 + 463 CF$UID - 460 + 465 CF$UID - 462 + 467 CF$UID - 464 + 469 CF$UID - 466 + 471 CF$UID - 468 + 473 CF$UID - 470 + 475 @@ -5808,10 +5889,10 @@ NS.relative CF$UID - 453 + 458 - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.cpp $class @@ -5826,7 +5907,25 @@ NS.relative CF$UID - 455 + 460 + + + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.hpp + + $class + + CF$UID + 28 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 462 file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.cpp @@ -5844,25 +5943,7 @@ NS.relative CF$UID - 457 - - - file://localhost/Users/zaphoyd/Documents/websocketpp/examples/chat_client/chat_client_handler.hpp - - $class - - CF$UID - 28 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 459 + 464 file://localhost/Users/zaphoyd/Documents/websocketpp/examples/chat_client/chat_client_handler.cpp @@ -5880,7 +5961,43 @@ NS.relative CF$UID - 461 + 466 + + + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp + + $class + + CF$UID + 28 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 468 + + + file://localhost/Users/zaphoyd/Documents/websocketpp/examples/chat_client/chat_client_handler.hpp + + $class + + CF$UID + 28 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 470 file://localhost/Users/zaphoyd/Documents/websocketpp/examples/chat_client/chat_client.cpp @@ -5898,7 +6015,7 @@ NS.relative CF$UID - 463 + 472 file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_session.hpp @@ -5916,7 +6033,7 @@ NS.relative CF$UID - 465 + 474 file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_session.cpp @@ -5934,46 +6051,10 @@ NS.relative CF$UID - 467 + 476 file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client_session.hpp - - $class - - CF$UID - 28 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 469 - - - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client_session.cpp - - $class - - CF$UID - 28 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 471 - - - file://localhost/Users/zaphoyd/Documents/websocketpp/examples/echo_client/echo_client_handler.cpp $class @@ -5982,26 +6063,6 @@ NS.keys - - CF$UID - 473 - - - CF$UID - 474 - - - CF$UID - 475 - - - CF$UID - 476 - - - CF$UID - 477 - CF$UID 478 @@ -6014,9 +6075,6 @@ CF$UID 480 - - NS.objects - CF$UID 481 @@ -6029,6 +6087,29 @@ CF$UID 483 + + CF$UID + 484 + + + CF$UID + 485 + + + NS.objects + + + CF$UID + 486 + + + CF$UID + 487 + + + CF$UID + 488 + CF$UID 16 @@ -6039,11 +6120,11 @@ CF$UID - 475 + 480 CF$UID - 492 + 497 CF$UID @@ -6059,7 +6140,7 @@ IDEActiveWorkspaceTabController IDEWindowToolbarIsVisible IDEWindowTabBarIsVisible - {{169, 0}, {2241, 1418}} + {{263, 0}, {2241, 1418}} $class @@ -6070,7 +6151,7 @@ CF$UID - 475 + 480 @@ -6082,26 +6163,6 @@ NS.keys - - CF$UID - 484 - - - CF$UID - 485 - - - CF$UID - 486 - - - CF$UID - 487 - - - CF$UID - 488 - CF$UID 489 @@ -6114,13 +6175,6 @@ CF$UID 491 - - NS.objects - - - CF$UID - 437 - CF$UID 492 @@ -6135,11 +6189,38 @@ CF$UID - 504 + 495 CF$UID - 592 + 496 + + + NS.objects + + + CF$UID + 442 + + + CF$UID + 497 + + + CF$UID + 498 + + + CF$UID + 499 + + + CF$UID + 509 + + + CF$UID + 581 CF$UID @@ -6147,7 +6228,7 @@ CF$UID - 601 + 590 @@ -6160,7 +6241,7 @@ IDEShowUtilities IDEEditorArea - websocket_client.cpp + websocket_server.hpp $class @@ -6171,14 +6252,14 @@ CF$UID - 495 + 500 NS.objects CF$UID - 496 + 501 @@ -6187,17 +6268,17 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 497 + 502 CF$UID - 502 + 507 @@ -6205,28 +6286,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 500 + 505 CF$UID - 501 + 506 @@ -6238,28 +6319,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 500 + 505 CF$UID - 503 + 508 @@ -6272,26 +6353,6 @@ NS.keys - - CF$UID - 505 - - - CF$UID - 506 - - - CF$UID - 507 - - - CF$UID - 508 - - - CF$UID - 509 - CF$UID 510 @@ -6300,24 +6361,40 @@ CF$UID 511 - - NS.objects - CF$UID 512 CF$UID - 510 + 513 CF$UID - 526 + 514 CF$UID - 540 + 515 + + + CF$UID + 516 + + + NS.objects + + + CF$UID + 517 + + + CF$UID + 515 + + + CF$UID + 531 CF$UID @@ -6329,7 +6406,11 @@ CF$UID - 583 + 555 + + + CF$UID + 572 @@ -6348,26 +6429,6 @@ NS.keys - - CF$UID - 513 - - - CF$UID - 514 - - - CF$UID - 515 - - - CF$UID - 516 - - - CF$UID - 517 - CF$UID 518 @@ -6376,21 +6437,10 @@ CF$UID 519 - - NS.objects - CF$UID 520 - - CF$UID - 16 - - - CF$UID - 352 - CF$UID 521 @@ -6401,13 +6451,44 @@ CF$UID - 520 + 523 CF$UID 524 + NS.objects + + + CF$UID + 525 + + + CF$UID + 16 + + + CF$UID + 357 + + + CF$UID + 526 + + + CF$UID + 527 + + + CF$UID + 525 + + + CF$UID + 529 + + IDEBatchFindNavigatorScrollPosition IDEBatchFindNavigatorShowsOptions @@ -6422,7 +6503,7 @@ $class CF$UID - 523 + 528 NSRangeCount 0 @@ -6440,7 +6521,7 @@ $class CF$UID - 525 + 530 NSRangeCount 0 @@ -6463,26 +6544,6 @@ NS.keys - - CF$UID - 527 - - - CF$UID - 528 - - - CF$UID - 529 - - - CF$UID - 530 - - - CF$UID - 531 - CF$UID 532 @@ -6499,13 +6560,6 @@ CF$UID 535 - - NS.objects - - - CF$UID - 492 - CF$UID 536 @@ -6516,7 +6570,7 @@ CF$UID - 537 + 538 CF$UID @@ -6524,11 +6578,30 @@ CF$UID - 16 + 540 + + + NS.objects + + + CF$UID + 497 CF$UID - 537 + 541 + + + CF$UID + 542 + + + CF$UID + 542 + + + CF$UID + 544 CF$UID @@ -6536,7 +6609,15 @@ CF$UID - 537 + 542 + + + CF$UID + 16 + + + CF$UID + 542 @@ -6554,7 +6635,7 @@ $class CF$UID - 538 + 543 NS.objects @@ -6572,60 +6653,11 @@ $class CF$UID - 357 + 362 NS.objects - - $class - - CF$UID - 65 - - NS.keys - - - CF$UID - 541 - - - CF$UID - 542 - - - CF$UID - 543 - - - CF$UID - 528 - - - NS.objects - - - CF$UID - 537 - - - CF$UID - 16 - - - CF$UID - 94 - - - CF$UID - 544 - - - - IDECollapsedtemsSet - IDEBreakpointNavigatorFilterOnEnabled - IDESelectedObjects - {{0, 0}, {259, 1075}} $class @@ -6646,16 +6678,65 @@ CF$UID 548 + + CF$UID + 533 + NS.objects CF$UID - 549 + 542 CF$UID - 520 + 16 + + + CF$UID + 94 + + + CF$UID + 549 + + + + IDECollapsedtemsSet + IDEBreakpointNavigatorFilterOnEnabled + IDESelectedObjects + {{0, 0}, {259, 1075}} + + $class + + CF$UID + 65 + + NS.keys + + + CF$UID + 551 + + + CF$UID + 552 + + + CF$UID + 553 + + + NS.objects + + + CF$UID + 554 + + + CF$UID + 525 CF$UID @@ -6675,26 +6756,6 @@ NS.keys - - CF$UID - 551 - - - CF$UID - 552 - - - CF$UID - 553 - - - CF$UID - 554 - - - CF$UID - 555 - CF$UID 556 @@ -6703,37 +6764,57 @@ CF$UID 557 - - NS.objects - CF$UID 558 - - CF$UID - 16 - - - CF$UID - 537 - - - CF$UID - 16 - - - CF$UID - 16 - CF$UID 559 + + CF$UID + 560 + + + CF$UID + 561 + + + CF$UID + 562 + + + NS.objects + + + CF$UID + 563 + + + CF$UID + 16 + + + CF$UID + 542 + + + CF$UID + 16 + + + CF$UID + 16 + CF$UID 564 + + CF$UID + 569 + IDEVisibleRect @@ -6751,85 +6832,67 @@ 64 NS.objects - - - CF$UID - 560 - - - - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 562 - - - CF$UID - 563 - - - - websocketpp - src - websocket_client.cpp - - $class - - CF$UID - 538 - - NS.objects CF$UID 565 + + + + $class + + CF$UID + 362 + + NS.objects + CF$UID 566 + + CF$UID + 567 + CF$UID 568 + + + websocketpp + src + websocket_session.cpp + + $class + + CF$UID + 543 + + NS.objects + + + CF$UID + 570 + CF$UID 571 + + + + $class + + CF$UID + 362 + + NS.objects + CF$UID - 573 - - - CF$UID - 575 - - - CF$UID - 577 - - - CF$UID - 578 - - - CF$UID - 580 - - - CF$UID - 582 + 566 @@ -6837,27 +6900,13 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 561 - - - - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 + 566 CF$UID @@ -6865,178 +6914,6 @@ - libraries - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 569 - - - CF$UID - 570 - - - - examples - echo_server - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 562 - - - CF$UID - 572 - - - - base64 - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 569 - - - CF$UID - 574 - - - - echo_client - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 569 - - - CF$UID - 576 - - - - chat_server - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 562 - - - - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 579 - - - - Products - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 569 - - - CF$UID - 581 - - - - chat_client - - $class - - CF$UID - 357 - - NS.objects - - - CF$UID - 561 - - - CF$UID - 569 - - - $class @@ -7047,30 +6924,30 @@ CF$UID - 584 + 573 CF$UID - 585 + 574 CF$UID - 586 + 575 CF$UID - 587 + 576 NS.objects CF$UID - 588 + 577 CF$UID - 589 + 578 CF$UID @@ -7078,7 +6955,7 @@ CF$UID - 544 + 549 @@ -7090,7 +6967,7 @@ $class CF$UID - 357 + 362 NS.objects @@ -7099,13 +6976,13 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 590 + 579 @@ -7113,13 +6990,13 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 591 + 580 @@ -7134,14 +7011,14 @@ CF$UID - 495 + 500 NS.objects CF$UID - 593 + 582 @@ -7149,21 +7026,21 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 594 + 583 CF$UID - 596 + 585 CF$UID - 598 + 587 @@ -7171,28 +7048,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 488 + 493 CF$UID - 595 + 584 @@ -7201,28 +7078,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 491 + 496 CF$UID - 597 + 586 @@ -7231,28 +7108,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 599 + 588 CF$UID - 600 + 589 @@ -7268,86 +7145,86 @@ CF$UID - 602 + 591 CF$UID - 603 + 592 CF$UID - 604 + 593 CF$UID - 605 + 594 CF$UID - 606 + 595 CF$UID - 607 + 596 CF$UID - 608 + 597 CF$UID - 609 + 598 CF$UID - 610 + 599 CF$UID - 611 + 600 NS.objects CF$UID - 492 + 497 CF$UID - 612 + 601 CF$UID - 650 + 639 CF$UID - 492 + 497 CF$UID - 437 + 442 CF$UID - 675 + 664 CF$UID - 699 + 688 CF$UID - 707 + 696 CF$UID - 708 + 697 CF$UID - 781 + 771 @@ -7371,14 +7248,14 @@ CF$UID - 613 + 602 NS.objects CF$UID - 614 + 603 @@ -7393,14 +7270,14 @@ CF$UID - 615 + 604 NS.objects CF$UID - 616 + 605 @@ -7409,36 +7286,36 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 617 + 606 CF$UID - 618 + 607 CF$UID - 619 + 608 NS.objects CF$UID - 620 + 609 CF$UID - 520 + 525 CF$UID - 648 + 637 @@ -7455,7 +7332,7 @@ CF$UID - 621 + 610 @@ -7469,7 +7346,46 @@ CF$UID - 622 + 611 + + + CF$UID + 612 + + + CF$UID + 613 + + + CF$UID + 614 + + + CF$UID + 615 + + + CF$UID + 616 + + + CF$UID + 617 + + + NS.objects + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 633 CF$UID @@ -7477,46 +7393,7 @@ CF$UID - 624 - - - CF$UID - 625 - - - CF$UID - 626 - - - CF$UID - 627 - - - CF$UID - 628 - - - NS.objects - - - CF$UID - 629 - - - CF$UID - 630 - - - CF$UID - 644 - - - CF$UID - 634 - - - CF$UID - 634 + 623 CF$UID @@ -7524,7 +7401,7 @@ CF$UID - 647 + 636 @@ -7540,22 +7417,22 @@ $class CF$UID - 643 + 632 DocumentLocation CF$UID - 640 + 629 DomainIdentifier CF$UID - 631 + 620 IdentifierPath CF$UID - 632 + 621 IndexOfDocumentIdentifier @@ -7574,15 +7451,15 @@ CF$UID - 633 + 622 CF$UID - 636 + 625 CF$UID - 638 + 627 @@ -7590,12 +7467,12 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 634 + 623 websocket_client_session.hpp @@ -7612,12 +7489,12 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 637 + 626 src @@ -7625,12 +7502,12 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 639 + 628 websocketpp @@ -7638,12 +7515,12 @@ $class CF$UID - 642 + 631 documentURL CF$UID - 641 + 630 timestamp @@ -7682,7 +7559,7 @@ $class CF$UID - 354 + 359 NS.keys @@ -7696,7 +7573,7 @@ CF$UID - 219 + 221 CF$UID @@ -7707,11 +7584,11 @@ CF$UID - 645 + 634 CF$UID - 646 + 635 CF$UID @@ -7739,7 +7616,7 @@ NS.relative CF$UID - 467 + 476 @@ -7752,7 +7629,7 @@ CF$UID - 649 + 638 @@ -7767,54 +7644,54 @@ CF$UID - 651 + 640 CF$UID - 652 + 641 CF$UID - 653 + 642 CF$UID - 654 + 643 CF$UID - 655 + 644 CF$UID - 656 + 645 NS.objects CF$UID - 437 + 442 CF$UID - 657 + 646 CF$UID - 659 + 648 CF$UID - 437 + 442 CF$UID - 667 + 656 CF$UID - 673 + 662 @@ -7834,7 +7711,7 @@ CF$UID - 658 + 647 NS.objects @@ -7856,14 +7733,14 @@ CF$UID - 495 + 500 NS.objects CF$UID - 660 + 649 @@ -7871,17 +7748,17 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 661 + 650 CF$UID - 664 + 653 @@ -7889,28 +7766,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 662 + 651 CF$UID - 663 + 652 @@ -7920,28 +7797,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 665 + 654 CF$UID - 666 + 655 @@ -7957,14 +7834,14 @@ CF$UID - 495 + 500 NS.objects CF$UID - 668 + 657 @@ -7972,17 +7849,17 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 669 + 658 CF$UID - 671 + 660 @@ -7990,28 +7867,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 662 + 651 CF$UID - 670 + 659 @@ -8020,28 +7897,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 665 + 654 CF$UID - 672 + 661 @@ -8056,14 +7933,14 @@ CF$UID - 674 + 663 NS.objects CF$UID - 437 + 442 @@ -8078,22 +7955,22 @@ CF$UID - 676 + 665 CF$UID - 613 + 602 NS.objects CF$UID - 520 + 525 CF$UID - 677 + 666 @@ -8108,14 +7985,14 @@ CF$UID - 615 + 604 NS.objects CF$UID - 678 + 667 @@ -8123,36 +8000,36 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 617 + 606 CF$UID - 618 + 607 CF$UID - 619 + 608 NS.objects CF$UID - 679 + 668 CF$UID - 520 + 525 CF$UID - 697 + 686 @@ -8166,7 +8043,7 @@ CF$UID - 680 + 669 @@ -8180,54 +8057,54 @@ CF$UID - 622 + 611 CF$UID - 623 + 612 CF$UID - 624 + 613 CF$UID - 625 + 614 CF$UID - 626 + 615 CF$UID - 627 + 616 CF$UID - 628 + 617 NS.objects + + CF$UID + 670 + + + CF$UID + 671 + CF$UID 681 CF$UID - 682 + 674 CF$UID - 692 - - - CF$UID - 685 - - - CF$UID - 685 + 674 CF$UID @@ -8235,7 +8112,7 @@ CF$UID - 695 + 684 @@ -8244,22 +8121,22 @@ $class CF$UID - 643 + 632 DocumentLocation CF$UID - 690 + 679 DomainIdentifier CF$UID - 631 + 620 IdentifierPath CF$UID - 683 + 672 IndexOfDocumentIdentifier @@ -8277,19 +8154,19 @@ CF$UID - 684 + 673 CF$UID - 686 + 675 CF$UID - 688 + 677 CF$UID - 689 + 678 @@ -8297,12 +8174,12 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 685 + 674 base64.cpp @@ -8310,12 +8187,12 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 687 + 676 base64 @@ -8323,36 +8200,36 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 637 + 626 $class CF$UID - 635 + 624 Identifier CF$UID - 639 + 628 $class CF$UID - 642 + 631 documentURL CF$UID - 691 + 680 timestamp @@ -8373,7 +8250,7 @@ $class CF$UID - 354 + 359 NS.keys @@ -8398,11 +8275,11 @@ CF$UID - 693 + 682 CF$UID - 694 + 683 @@ -8422,7 +8299,7 @@ NS.relative CF$UID - 696 + 685 file://localhost/Users/zaphoyd/Documents/websocketpp/src/base64/base64.cpp @@ -8436,7 +8313,7 @@ CF$UID - 698 + 687 @@ -8451,14 +8328,14 @@ CF$UID - 495 + 500 NS.objects CF$UID - 700 + 689 @@ -8466,17 +8343,17 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 701 + 690 CF$UID - 704 + 693 @@ -8484,28 +8361,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 702 + 691 CF$UID - 703 + 692 @@ -8515,28 +8392,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 498 + 503 CF$UID - 499 + 504 NS.objects CF$UID - 705 + 694 CF$UID - 706 + 695 @@ -8563,22 +8440,22 @@ CF$UID - 709 + 698 CF$UID - 710 + 699 NS.objects CF$UID - 711 + 700 CF$UID - 712 + 701 @@ -8595,22 +8472,22 @@ CF$UID - 713 + 702 CF$UID - 714 + 703 NS.objects CF$UID - 715 + 704 CF$UID - 763 + 752 @@ -8620,36 +8497,36 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 716 + 705 CF$UID - 717 + 706 CF$UID - 718 + 707 NS.objects CF$UID - 719 + 708 CF$UID - 437 + 442 CF$UID - 760 + 749 @@ -8660,17 +8537,17 @@ $class CF$UID - 357 + 362 NS.objects CF$UID - 720 + 709 CF$UID - 747 + 736 @@ -8684,62 +8561,62 @@ CF$UID - 721 + 710 CF$UID - 722 + 711 CF$UID - 723 + 712 CF$UID - 724 + 713 CF$UID - 725 + 714 CF$UID - 726 + 715 CF$UID - 727 + 716 NS.objects + + CF$UID + 717 + + + CF$UID + 718 + CF$UID 728 CF$UID - 729 + 731 CF$UID - 739 + 732 CF$UID - 742 + 733 CF$UID - 743 - - - CF$UID - 744 - - - CF$UID - 745 + 734 @@ -8750,17 +8627,17 @@ DocumentNavigableItemName DocumentExtensionIdentifier DocumentURL - public.c-plus-plus-header + public.c-plus-plus-source $class CF$UID - 643 + 632 DocumentLocation CF$UID - 737 + 726 DomainIdentifier @@ -8770,7 +8647,7 @@ IdentifierPath CF$UID - 730 + 719 IndexOfDocumentIdentifier @@ -8788,11 +8665,11 @@ CF$UID - 731 + 720 CF$UID - 734 + 723 @@ -8806,19 +8683,19 @@ CF$UID - 732 + 721 NS.objects CF$UID - 733 + 722 navigableItem_name - websocket_client.hpp + websocket_server.cpp $class @@ -8829,14 +8706,14 @@ CF$UID - 735 + 724 NS.objects CF$UID - 736 + 725 @@ -8846,12 +8723,12 @@ $class CF$UID - 642 + 631 documentURL CF$UID - 738 + 727 timestamp @@ -8866,24 +8743,16 @@ 115 NS.string - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.cpp $class CF$UID - 354 + 359 NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -8892,16 +8761,24 @@ CF$UID 227 + + CF$UID + 228 + + + CF$UID + 229 + NS.objects CF$UID - 740 + 729 CF$UID - 741 + 730 CF$UID @@ -8913,10 +8790,10 @@ - 339336681.32442498 - {0, 2617} - websocket_client.hpp - websocket_client.hpp + 339337834.27251703 + {0, 2783} + websocket_server.cpp + websocket_server.cpp Xcode.IDEKit.EditorDocument.SourceCode $class @@ -8932,10 +8809,10 @@ NS.relative CF$UID - 746 + 735 - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.cpp $class @@ -8946,62 +8823,62 @@ CF$UID - 721 + 710 CF$UID - 722 + 711 CF$UID - 723 + 712 CF$UID - 724 + 713 CF$UID - 725 + 714 CF$UID - 726 + 715 CF$UID - 727 + 716 NS.objects CF$UID - 728 + 717 CF$UID - 748 + 737 CF$UID - 753 + 742 CF$UID - 756 + 745 CF$UID - 757 + 746 CF$UID - 744 + 733 CF$UID - 758 + 747 @@ -9009,12 +8886,12 @@ $class CF$UID - 643 + 632 DocumentLocation CF$UID - 737 + 726 DomainIdentifier @@ -9024,7 +8901,7 @@ IdentifierPath CF$UID - 749 + 738 IndexOfDocumentIdentifier @@ -9042,11 +8919,11 @@ CF$UID - 750 + 739 CF$UID - 752 + 741 @@ -9060,18 +8937,18 @@ CF$UID - 732 + 721 NS.objects CF$UID - 751 + 740 - websocket_client.hpp + websocket_server.cpp $class @@ -9082,14 +8959,14 @@ CF$UID - 735 + 724 NS.objects CF$UID - 736 + 725 @@ -9097,18 +8974,10 @@ $class CF$UID - 354 + 359 NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -9117,16 +8986,24 @@ CF$UID 227 + + CF$UID + 228 + + + CF$UID + 229 + NS.objects CF$UID - 754 + 743 CF$UID - 755 + 744 CF$UID @@ -9138,10 +9015,10 @@ - 339336681.324678 - {0, 2617} - websocket_client.hpp - websocket_client.hpp + 339337834.27279299 + {0, 2783} + websocket_server.cpp + websocket_server.cpp $class @@ -9156,25 +9033,25 @@ NS.relative CF$UID - 759 + 748 - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.hpp + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.cpp $class CF$UID - 357 + 362 NS.objects CF$UID - 761 + 750 CF$UID - 762 + 751 @@ -9184,28 +9061,28 @@ $class CF$UID - 354 + 359 NS.keys CF$UID - 716 + 705 CF$UID - 717 + 706 CF$UID - 718 + 707 NS.objects CF$UID - 764 + 753 CF$UID @@ -9213,7 +9090,7 @@ CF$UID - 779 + 769 @@ -9227,7 +9104,7 @@ CF$UID - 765 + 754 @@ -9241,86 +9118,86 @@ CF$UID - 721 + 710 CF$UID - 722 + 711 CF$UID - 723 + 712 CF$UID - 724 + 713 CF$UID - 725 + 714 CF$UID - 726 + 715 CF$UID - 727 + 716 NS.objects CF$UID - 766 + 755 + + + CF$UID + 756 + + + CF$UID + 764 + + + CF$UID + 759 + + + CF$UID + 759 + + + CF$UID + 733 CF$UID 767 - - CF$UID - 774 - - - CF$UID - 563 - - - CF$UID - 563 - - - CF$UID - 744 - - - CF$UID - 777 - - public.c-plus-plus-source + public.c-plus-plus-header $class CF$UID - 643 + 632 DocumentLocation CF$UID - 773 + 763 DomainIdentifier CF$UID - 631 + 620 IdentifierPath CF$UID - 768 + 757 IndexOfDocumentIdentifier @@ -9338,15 +9215,15 @@ CF$UID - 769 + 758 CF$UID - 770 + 760 CF$UID - 771 + 761 @@ -9354,36 +9231,37 @@ $class CF$UID - 635 + 624 Identifier CF$UID - 563 + 759 + + + websocket_server.hpp + + $class + + CF$UID + 624 + + Identifier + + CF$UID + 567 $class CF$UID - 635 + 624 Identifier CF$UID - 562 - - - - $class - - CF$UID - 635 - - Identifier - - CF$UID - 772 + 762 websocketpp @@ -9391,12 +9269,12 @@ $class CF$UID - 642 + 631 documentURL CF$UID - 165 + 201 timestamp @@ -9408,18 +9286,10 @@ $class CF$UID - 354 + 359 NS.keys - - CF$UID - 224 - - - CF$UID - 225 - CF$UID 226 @@ -9428,8 +9298,152 @@ CF$UID 227 + + CF$UID + 228 + + + CF$UID + 229 + NS.objects + + + CF$UID + 765 + + + CF$UID + 766 + + + CF$UID + 16 + + + CF$UID + 158 + + + + 339337834.27240598 + {0, 2617} + + $class + + CF$UID + 28 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 768 + + + file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_server.hpp + + $class + + CF$UID + 64 + + NS.objects + + + CF$UID + 770 + + + + {{0, 0}, {1981, 968}} + + $class + + CF$UID + 796 + + geniusEditorContextNode + + CF$UID + 781 + + primaryEditorContextNode + + CF$UID + 772 + + rootLayoutTreeNode + + CF$UID + 779 + + + + $class + + CF$UID + 789 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 773 + + orientation + 0 + parent + + CF$UID + 779 + + + + $class + + CF$UID + 632 + + DocumentLocation + + CF$UID + 763 + + DomainIdentifier + + CF$UID + 620 + + IdentifierPath + + CF$UID + 774 + + IndexOfDocumentIdentifier + + CF$UID + 129 + + + + $class + + CF$UID + 64 + + NS.objects CF$UID @@ -9441,193 +9455,57 @@ CF$UID - 16 - - - CF$UID - 158 + 777 - 339336681.32431501 - {0, 2739} $class CF$UID - 28 + 624 - NS.base + Identifier CF$UID - 0 + 759 - NS.relative + + + $class + + CF$UID + 624 + + Identifier + + CF$UID + 567 + + + + $class + + CF$UID + 624 + + Identifier CF$UID 778 - file://localhost/Users/zaphoyd/Documents/websocketpp/src/websocket_client.cpp - - $class - - CF$UID - 64 - - NS.objects - - - CF$UID - 780 - - - - {{0, 0}, {1981, 968}} - - $class - - CF$UID - 806 - - geniusEditorContextNode - - CF$UID - 791 - - primaryEditorContextNode - - CF$UID - 782 - - rootLayoutTreeNode - - CF$UID - 789 - - - - $class - - CF$UID - 799 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 783 - - orientation - 0 - parent - - CF$UID - 789 - - - - $class - - CF$UID - 643 - - DocumentLocation - - CF$UID - 773 - - DomainIdentifier - - CF$UID - 631 - - IdentifierPath - - CF$UID - 784 - - IndexOfDocumentIdentifier - - CF$UID - 129 - - - - $class - - CF$UID - 64 - - NS.objects - - - CF$UID - 785 - - - CF$UID - 786 - - - CF$UID - 787 - - - - - $class - - CF$UID - 635 - - Identifier - - CF$UID - 563 - - - - $class - - CF$UID - 635 - - Identifier - - CF$UID - 562 - - - - $class - - CF$UID - 635 - - Identifier - - CF$UID - 788 - - websocketpp $class CF$UID - 799 + 789 children CF$UID - 790 + 780 contentType 0 @@ -9654,39 +9532,39 @@ CF$UID - 782 + 772 CF$UID - 791 + 781 $class - - CF$UID - 799 - - children - - CF$UID - 792 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent CF$UID 789 + children + + CF$UID + 782 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 779 + $class @@ -9698,11 +9576,11 @@ CF$UID - 793 + 783 CF$UID - 800 + 790 @@ -9710,7 +9588,7 @@ $class CF$UID - 799 + 789 children @@ -9722,26 +9600,26 @@ documentArchivableRepresentation CF$UID - 794 + 784 orientation 0 parent CF$UID - 791 + 781 $class CF$UID - 643 + 632 DocumentLocation CF$UID - 737 + 726 DomainIdentifier @@ -9751,7 +9629,7 @@ IdentifierPath CF$UID - 795 + 785 IndexOfDocumentIdentifier @@ -9769,11 +9647,11 @@ CF$UID - 796 + 786 CF$UID - 798 + 788 @@ -9787,18 +9665,18 @@ CF$UID - 732 + 721 NS.objects CF$UID - 797 + 787 - websocket_client.hpp + websocket_server.cpp $class @@ -9809,14 +9687,14 @@ CF$UID - 735 + 724 NS.objects CF$UID - 736 + 725 @@ -9833,7 +9711,7 @@ $class CF$UID - 799 + 789 children @@ -9845,26 +9723,26 @@ documentArchivableRepresentation CF$UID - 801 + 791 orientation 0 parent CF$UID - 791 + 781 $class CF$UID - 643 + 632 DocumentLocation CF$UID - 737 + 726 DomainIdentifier @@ -9874,7 +9752,7 @@ IdentifierPath CF$UID - 802 + 792 IndexOfDocumentIdentifier @@ -9892,11 +9770,11 @@ CF$UID - 803 + 793 CF$UID - 805 + 795 @@ -9910,18 +9788,18 @@ CF$UID - 732 + 721 NS.objects CF$UID - 804 + 794 - websocket_client.hpp + websocket_server.cpp $class @@ -9932,14 +9810,14 @@ CF$UID - 735 + 724 NS.objects CF$UID - 736 + 725 diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000000..f885bfa69a --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,9 @@ +*.user +*.ncb +*.suo +Debug +Release +examples/*.user +examples/*.ncb +examples/Debug +examples/Release diff --git a/windows/examples/chatclient.vcproj b/windows/examples/chatclient.vcproj new file mode 100644 index 0000000000..4919d9f806 --- /dev/null +++ b/windows/examples/chatclient.vcproj @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/examples/chatserver.vcproj b/windows/examples/chatserver.vcproj new file mode 100644 index 0000000000..a0080e75a8 --- /dev/null +++ b/windows/examples/chatserver.vcproj @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/examples/echoserver.vcproj b/windows/examples/echoserver.vcproj new file mode 100644 index 0000000000..f0d6c88bea --- /dev/null +++ b/windows/examples/echoserver.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/stdint.h b/windows/stdint.h new file mode 100644 index 0000000000..b68541271b --- /dev/null +++ b/windows/stdint.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011, Peter Thorson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the WebSocket++ Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef STDINT_WIN32_H +#define STDINT_WIN32_H + +/* This file emulates enough of stdint.h on Windows. */ +#define INT32_MIN (-2147483647i32 - 1) /* minimum signed 32 bit value */ +#define INT32_MAX 2147483647i32 /* maximum signed 32 bit value */ + +typedef unsigned char uint8_t; +typedef signed char int8_t; +typedef unsigned short uint16_t; +typedef short int16_t; +typedef unsigned int uint32_t; +typedef int int32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; + +#endif diff --git a/windows/websocketpp.sln b/windows/websocketpp.sln new file mode 100644 index 0000000000..2c657c2785 --- /dev/null +++ b/windows/websocketpp.sln @@ -0,0 +1,54 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "websocketpp", "websocketpp.vcproj", "{1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{14E490FC-930E-40EE-B14A-84E2D98DEC9F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoserver", "examples\echoserver.vcproj", "{B569A272-D7D3-404B-B5FB-9187C0EB9F48}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatserver", "examples\chatserver.vcproj", "{2AFECE48-86DE-47D0-9263-DC0D203AA62D}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatclient", "examples\chatclient.vcproj", "{116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Debug|Win32.Build.0 = Debug|Win32 + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Release|Win32.ActiveCfg = Release|Win32 + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Release|Win32.Build.0 = Release|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Debug|Win32.ActiveCfg = Debug|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Debug|Win32.Build.0 = Debug|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Release|Win32.ActiveCfg = Release|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Release|Win32.Build.0 = Release|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Debug|Win32.ActiveCfg = Debug|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Debug|Win32.Build.0 = Debug|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Release|Win32.ActiveCfg = Release|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Release|Win32.Build.0 = Release|Win32 + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Debug|Win32.ActiveCfg = Debug|Win32 + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Debug|Win32.Build.0 = Debug|Win32 + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Release|Win32.ActiveCfg = Release|Win32 + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B569A272-D7D3-404B-B5FB-9187C0EB9F48} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} + {2AFECE48-86DE-47D0-9263-DC0D203AA62D} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} + EndGlobalSection +EndGlobal diff --git a/windows/websocketpp.vcproj b/windows/websocketpp.vcproj new file mode 100644 index 0000000000..deea893c45 --- /dev/null +++ b/windows/websocketpp.vcproj @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +