Skip to content

Fix lsl_cpp.h exception handling #194

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

Merged
tstenner merged 5 commits into from
May 26, 2023
Merged

Fix lsl_cpp.h exception handling #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5919374
Fixed bug #187 in netinterfaces.cpp
jchen-dawnscene Mar 30, 2023
fce5a44
Merge branch 'jchen/bug-187'
jchen-dawnscene Apr 1, 2023
771bdbf
Merge remote-tracking branch 'upstream/master'
jchen-dawnscene Apr 24, 2023
92733fd
Merge remote-tracking branch 'upstream/master' into HEAD
jchen-dawnscene Apr 25, 2023
f0d30d9
Fix lsl_cpp.h exception handling
jchen-dawnscene May 6, 2023
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
2 changes: 1 addition & 1 deletion include/lsl_cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,7 @@ inline int32_t check_error(int32_t ec) {
switch (ec) {
case lsl_timeout_error: throw timeout_error("The operation has timed out.");
case lsl_lost_error:
throw timeout_error(
throw lost_error(
"The stream has been lost; to continue reading, you need to re-resolve it.");
case lsl_argument_error:
throw std::invalid_argument("An argument was incorrectly specified.");
Expand Down
2 changes: 1 addition & 1 deletion src/netinterfaces.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ std::vector<lsl::netif> lsl::get_local_interfaces() {
// No address? Skip.
if (addr->ifa_addr == nullptr) continue;
LOG_F(INFO, "netif '%s' (status: %d, multicast: %d, broadcast: %d)", addr->ifa_name,
addr->ifa_flags & IFF_MULTICAST, addr->ifa_flags & IFF_UP,
addr->ifa_flags & IFF_UP, addr->ifa_flags & IFF_MULTICAST,
addr->ifa_flags & IFF_BROADCAST);
// Interface doesn't support multicast? Skip.
if (!(addr->ifa_flags & IFF_MULTICAST)) continue;
Expand Down