Skip to content

Commit c55f031

Browse files
committed
Merge branch 'develop' into dev_update_detection_parser
2 parents 959aa51 + 8fbada6 commit c55f031

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/python-main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ jobs:
300300
strategy:
301301
matrix:
302302
python-version: [3.9, '3.10', '3.11', '3.12', '3.13', '3.14']
303-
os: [macos-15-intel, macos-14]
303+
os: [macos-13, macos-14]
304304
fail-fast: false
305305
runs-on: ${{ matrix.os }}
306306
env:
@@ -371,7 +371,7 @@ jobs:
371371
needs: build-macos
372372
strategy:
373373
matrix:
374-
os: [macos-15-intel, macos-14]
374+
os: [macos-13, macos-14]
375375
fail-fast: false
376376
runs-on: ${{ matrix.os }}
377377
steps:

src/remote_connection/RemoteConnectionImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ bool RemoteConnectionImpl::initWebsocketServer(const std::string& address, uint1
127127
serverOptions.supportedEncodings.emplace_back("json");
128128

129129
// Priority assignment function - based on their datatype (see server options above)
130-
getMessagePriority = [this](DatatypeEnum dtype) -> uint8_t {
130+
getMessagePriority = [](DatatypeEnum dtype) -> uint8_t {
131131
if(dtype == DatatypeEnum::ImgDetections || dtype == DatatypeEnum::ImgAnnotations) {
132132
return 1;
133133
}

0 commit comments

Comments
 (0)