Skip to content

Commit eb9a7be

Browse files
committed
fix warning about member variable initialization order + minor makefile build fix
1 parent d20864d commit eb9a7be

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

ixwebsocket/IXWebSocketTransport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ namespace ix
7171
, _closingTimePoint(std::chrono::steady_clock::now())
7272
, _enablePong(kDefaultEnablePong)
7373
, _pingIntervalSecs(kDefaultPingIntervalSecs)
74+
, _pongReceived(false)
7475
, _setCustomMessage(false)
7576
, _kPingMessage("ixwebsocket::heartbeat")
7677
, _pingType(SendMessageKind::Ping)
77-
, _pongReceived(false)
7878
, _pingCount(0)
7979
, _lastSendPingTimePoint(std::chrono::steady_clock::now())
8080
{

makefile.dev

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,24 @@ all: brew
1313

1414
install: brew
1515

16+
-DCMAKE_INSTALL_PREFIX=/opt/homebrew
17+
1618
# Use -DCMAKE_INSTALL_PREFIX= to install into another location
1719
# on osx it is good practice to make /usr/local user writable
1820
# sudo chown -R `whoami`/staff /usr/local
1921
#
22+
# Those days (since Apple Silicon mac shipped), on macOS homebrew installs in /opt/homebrew, and /usr/local is readonly
23+
#
2024
# Release, Debug, MinSizeRel, RelWithDebInfo are the build types
2125
#
2226
# Default rule does not use python as that requires first time users to have Python3 installed
2327
#
2428
brew:
29+
ifeq ($(shell uname),Darwin)
30+
mkdir -p build && (cd build ; cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt/homebrew -DCMAKE_UNITY_BUILD=OFF -DCMAKE_INSTALL_MESSAGE=LAZY -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; ninja install)
31+
else
2532
mkdir -p build && (cd build ; cmake -GNinja -DCMAKE_UNITY_BUILD=OFF -DCMAKE_INSTALL_MESSAGE=LAZY -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; ninja install)
33+
endif
2634

2735
# Docker default target. We've had problems with OpenSSL and TLS 1.3 (on the
2836
# server side ?) and I can't work-around it easily, so we're using mbedtls on

0 commit comments

Comments
 (0)