Skip to content

Commit

Permalink
update websocketpp
Browse files Browse the repository at this point in the history
  • Loading branch information
CamJN committed Dec 29, 2024
1 parent ad4248a commit 6aca17b
Show file tree
Hide file tree
Showing 35 changed files with 2,272 additions and 1,350 deletions.
4 changes: 4 additions & 0 deletions src/cxx_supportlib/vendor-modified/websocketpp/COPYING
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Main Library:

BSD 3-Clause License

Copyright (c) 2014, Peter Thorson. All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -64,6 +66,8 @@ use as a header only library. This conversion was done by Peter Thorson
([email protected]) in 2013. All modifications to the code are redistributed
under the same license as the original, which is listed below.

New BSD License / 3-Clause BSD License

Copyright (c) 2011, Micael Hildenborg
All rights reserved.

Expand Down
444 changes: 0 additions & 444 deletions src/cxx_supportlib/vendor-modified/websocketpp/changelog.md

This file was deleted.

49 changes: 0 additions & 49 deletions src/cxx_supportlib/vendor-modified/websocketpp/readme.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@
#endif

#ifndef __GNUC__
// GCC as of version 4.9 (latest) does not support std::put_time yet.
// GCC as of version 4.9 does not support std::put_time yet.
// so ignore it
#define _WEBSOCKETPP_PUTTIME_

// todo: std::put_time may be present in version 5+
#endif
#else
// In the absence of a blanket define, try to use compiler versions or
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
#include <functional>
#else
#include <boost/bind/bind.hpp>
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <boost/ref.hpp>
#endif
Expand Down Expand Up @@ -83,7 +83,12 @@ namespace lib {
using boost::function;
using boost::bind;
using boost::ref;
namespace placeholders = boost::placeholders;
namespace placeholders {
/// \todo this feels hacky, is there a better way?
using ::_1;
using ::_2;
using ::_3;
}

// See above definition for more details on what this is and why it exists
#define _WEBSOCKETPP_REF(x) boost::ref(x)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static void md5_process(md5_state_t *pms, md5_byte_t const * data /*[64]*/) {
* On little-endian machines, we can process properly aligned
* data without copying it.
*/
if (!((reinterpret_cast<uintptr_t>(data)) & 3)) {
if (!((data - (md5_byte_t const *)0) & 3)) {
/* data are properly aligned */
X = (md5_word_t const *)data;
} else {
Expand Down
Loading

0 comments on commit 6aca17b

Please sign in to comment.