Skip to content

Fix build for c++ 20 #1060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Fix build for c++ 20 #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0823cfe
Fix build for cpp 20
andreazevedo Aug 28, 2022
9b7fdd5
Fix build for cpp 20
andreazevedo Aug 28, 2022
e4a69b3
Add bazel support
andreazevedo Jan 13, 2025
c5de03d
Attempt to fix includes in bazel
andreazevedo Jan 13, 2025
cbf6c1c
Attempt #2 at fixing include path
andreazevedo Jan 13, 2025
3e1fd6f
Try fix include path of files
andreazevedo Jan 13, 2025
a4d95e7
Another attmpt
andreazevedo Jan 13, 2025
b68433f
.
andreazevedo Jan 13, 2025
225cb91
Fix bazel build
andreazevedo Jan 13, 2025
e598705
Bazel build
andreazevedo Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,10 @@ install
Makefile
bin

# bazel
MODULE.bazel.lock
bazel-bin
bazel-out
bazel-*

Testing/Temporary/CTestCostData.txt
13 changes: 13 additions & 0 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package(default_visibility = ["//visibility:public"])

#################
## WebSocket++ ##
#################
cc_library(
name = "websocketpp",
hdrs = glob(["websocketpp/**/*.hpp"]),
includes = ["."],
deps = [
"@asio//:asio",
],
)
6 changes: 6 additions & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module(
name = "websocketpp",
repo_name = "andreazevedo_websocketpp",
)

bazel_dep(name = "asio", version = "1.32.0")
2 changes: 1 addition & 1 deletion websocketpp/endpoint.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class endpoint : public config::transport_type, public config::endpoint_base {


/// Destructor
~endpoint<connection,config>() {}
~endpoint() {}

#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable
Expand Down
14 changes: 7 additions & 7 deletions websocketpp/logger/basic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,33 @@ namespace log {
template <typename concurrency, typename names>
class basic {
public:
basic<concurrency,names>(channel_type_hint::value h =
basic(channel_type_hint::value h =
channel_type_hint::access)
: m_static_channels(0xffffffff)
, m_dynamic_channels(0)
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}

basic<concurrency,names>(std::ostream * out)
basic(std::ostream * out)
: m_static_channels(0xffffffff)
, m_dynamic_channels(0)
, m_out(out) {}

basic<concurrency,names>(level c, channel_type_hint::value h =
basic(level c, channel_type_hint::value h =
channel_type_hint::access)
: m_static_channels(c)
, m_dynamic_channels(0)
, m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}

basic<concurrency,names>(level c, std::ostream * out)
basic(level c, std::ostream * out)
: m_static_channels(c)
, m_dynamic_channels(0)
, m_out(out) {}

/// Destructor
~basic<concurrency,names>() {}
~basic() {}

/// Copy constructor
basic<concurrency,names>(basic<concurrency,names> const & other)
basic(basic<concurrency,names> const & other)
: m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out)
Expand All @@ -97,7 +97,7 @@ class basic {

#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor
basic<concurrency,names>(basic<concurrency,names> && other)
basic(basic<concurrency,names> && other)
: m_static_channels(other.m_static_channels)
, m_dynamic_channels(other.m_dynamic_channels)
, m_out(other.m_out)
Expand Down
6 changes: 3 additions & 3 deletions websocketpp/roles/server_endpoint.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ class server : public endpoint<connection<config>,config> {
}

/// Destructor
~server<config>() {}
~server() {}

#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no copy constructor because endpoints are not copyable
server<config>(server<config> &) = delete;
server(server<config> &) = delete;

// no copy assignment operator because endpoints are not copyable
server<config> & operator=(server<config> const &) = delete;
#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_

#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
/// Move constructor
server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}

#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
// no move assignment operator because of const member variables
Expand Down