vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-10 04:30:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the new C++20 starts_with() and contains()

Browse Source
This commit is contained in:
Robbert van der Helm
2020-06-06 13:29:12 +02:00
parent 8202a6b250
commit 4403585a70
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin/utils.cpp
+6 -5
View File
@@ -44,8 +44,9 @@ std::string create_logger_prefix(const fs::path& socket_path) {
// part since that's redundant // part since that's redundant
std::string socket_name = std::string socket_name =
socket_path.filename().replace_extension().string(); socket_path.filename().replace_extension().string();
const std::string socket_prefix("yabridge-");
assert(socket_name.find(socket_prefix) == 0); constexpr std::string_view socket_prefix("yabridge-");
assert(socket_name.starts_with(socket_prefix));
socket_name = socket_name.substr(socket_prefix.size()); socket_name = socket_name.substr(socket_prefix.size());
std::ostringstream prefix; std::ostringstream prefix;
@@ -229,7 +230,7 @@ fs::path get_this_file_location() {
// leading slash and then normalize the path, since three or more // leading slash and then normalize the path, since three or more
// slashes will be coerced into a single slash. // slashes will be coerced into a single slash.
fs::path this_file = boost::dll::this_line_location(); fs::path this_file = boost::dll::this_line_location();
if (this_file.string().find("//") == 0) { if (this_file.string().starts_with("//")) {
this_file = ("/" / this_file).lexically_normal(); this_file = ("/" / this_file).lexically_normal();
} }
@@ -261,8 +262,8 @@ std::string get_wine_version() {
// Strip the `wine-` prefix from the output, could potentially be absent in // Strip the `wine-` prefix from the output, could potentially be absent in
// custom Wine builds // custom Wine builds
const std::string version_prefix("wine-"); constexpr std::string_view version_prefix("wine-");
if (version_string.find(version_prefix) == 0) { if (version_string.starts_with(version_prefix)) {
version_string = version_string.substr(version_prefix.size()); version_string = version_string.substr(version_prefix.size());
} }
src/wine-host/bridges/group.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ void GroupBridge::accept_requests() {
// Collisions in the generated socket names should be very rare, but // Collisions in the generated socket names should be very rare, but
// it could in theory happen // it could in theory happen
assert(active_plugins.find(request) == active_plugins.end()); assert(!active_plugins.contains(request));
// The plugin has to be initiated on the IO context's thread because // The plugin has to be initiated on the IO context's thread because
// this has to be done on the same thread that's handling messages, // this has to be done on the same thread that's handling messages,