From 2bf1c4c5eb97c31da7c7d79b5f7e990a4601f23e Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Mon, 31 May 2021 17:46:45 +0200
Subject: [PATCH] Use C++20 [[unlikely]] instead of BOOST_UNLIKELY

---
 src/common/communication/common.h |  2 +-
 src/common/logging/vst2.cpp       | 12 ++++++------
 src/common/logging/vst3.cpp       |  2 +-
 src/common/logging/vst3.h         |  2 +-
 src/plugin/bridges/vst2.cpp       |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/common/communication/common.h b/src/common/communication/common.h
index 21ed834b..9f42d715 100644
--- a/src/common/communication/common.h
+++ b/src/common/communication/common.h
@@ -208,7 +208,7 @@ inline T& read_object(Socket& socket,
         bitsery::quickDeserialization<InputAdapter<SerializationBufferBase>>(
             {buffer.begin(), size}, object);
 
-    if (BOOST_UNLIKELY(!success)) {
+    if (!success) [[unlikely]] {
         throw std::runtime_error("Deserialization failure in call: " +
                                  std::string(__PRETTY_FUNCTION__));
     }
diff --git a/src/common/logging/vst2.cpp b/src/common/logging/vst2.cpp
index 000c51e7..fc30de6c 100644
--- a/src/common/logging/vst2.cpp
+++ b/src/common/logging/vst2.cpp
@@ -327,7 +327,7 @@ std::optional<std::string> opcode_to_string(bool is_dispatch, int opcode) {
 }
 
 void Vst2Logger::log_get_parameter(int index) {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::most_events)) {
+    if (logger.verbosity >= Logger::Verbosity::most_events) [[unlikely]] {
         std::ostringstream message;
         message << ">> getParameter() " << index;
 
@@ -336,7 +336,7 @@ void Vst2Logger::log_get_parameter(int index) {
 }
 
 void Vst2Logger::log_get_parameter_response(float value) {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::most_events)) {
+    if (logger.verbosity >= Logger::Verbosity::most_events) [[unlikely]] {
         std::ostringstream message;
         message << "   getParameter() :: " << value;
 
@@ -345,7 +345,7 @@ void Vst2Logger::log_get_parameter_response(float value) {
 }
 
 void Vst2Logger::log_set_parameter(int index, float value) {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::most_events)) {
+    if (logger.verbosity >= Logger::Verbosity::most_events) [[unlikely]] {
         std::ostringstream message;
         message << ">> setParameter() " << index << " = " << value;
 
@@ -354,7 +354,7 @@ void Vst2Logger::log_set_parameter(int index, float value) {
 }
 
 void Vst2Logger::log_set_parameter_response() {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::most_events)) {
+    if (logger.verbosity >= Logger::Verbosity::most_events) [[unlikely]] {
         log("   setParameter() :: OK");
     }
 }
@@ -367,7 +367,7 @@ void Vst2Logger::log_event(
     const Vst2Event::Payload& payload,
     float option,
     const std::optional<Vst2Event::Payload>& value_payload) {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::most_events)) {
+    if (logger.verbosity >= Logger::Verbosity::most_events) [[unlikely]] {
         if (should_filter_event(is_dispatch, opcode)) {
             return;
         }
@@ -455,7 +455,7 @@ void Vst2Logger::log_event_response(
     const Vst2EventResult::Payload& payload,
     const std::optional<Vst2EventResult::Payload>& value_payload,
     bool from_cache) {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::most_events)) {
+    if (logger.verbosity >= Logger::Verbosity::most_events) [[unlikely]] {
         if (should_filter_event(is_dispatch, opcode)) {
             return;
         }
diff --git a/src/common/logging/vst3.cpp b/src/common/logging/vst3.cpp
index 3fdb08c9..d48c80ab 100644
--- a/src/common/logging/vst3.cpp
+++ b/src/common/logging/vst3.cpp
@@ -57,7 +57,7 @@ void Vst3Logger::log_query_interface(
     const std::string& where,
     tresult result,
     const std::optional<Steinberg::FUID>& uid) {
-    if (BOOST_UNLIKELY(logger.verbosity >= Logger::Verbosity::all_events)) {
+    if (logger.verbosity >= Logger::Verbosity::all_events) [[unlikely]] {
         std::ostringstream message;
         std::string uid_string = uid ? format_uid(*uid) : "<unknown_pointer>";
 
diff --git a/src/common/logging/vst3.h b/src/common/logging/vst3.h
index b452a5a9..b440fd9f 100644
--- a/src/common/logging/vst3.h
+++ b/src/common/logging/vst3.h
@@ -355,7 +355,7 @@ class Vst3Logger {
     bool log_request_base(bool is_host_vst,
                           Logger::Verbosity min_verbosity,
                           F callback) {
-        if (BOOST_UNLIKELY(logger.verbosity >= min_verbosity)) {
+        if (logger.verbosity >= min_verbosity) [[unlikely]] {
             std::ostringstream message;
             if (is_host_vst) {
                 message << "[host -> vst] >> ";
diff --git a/src/plugin/bridges/vst2.cpp b/src/plugin/bridges/vst2.cpp
index 8a0eabe7..1293c11b 100644
--- a/src/plugin/bridges/vst2.cpp
+++ b/src/plugin/bridges/vst2.cpp
@@ -462,7 +462,7 @@ intptr_t Vst2PluginBridge::dispatch(AEffect* /*plugin*/,
     //       been a release that contains the fix yet. This should be removed
     //       once Ardour 6.0 gets released.
     //       https://tracker.ardour.org/view.php?id=7668
-    if (BOOST_UNLIKELY(plugin.magic == 0)) {
+    if (plugin.magic == 0) [[unlikely]] {
         logger.log_event(true, opcode, index, value, nullptr, option,
                          std::nullopt);
         logger.log(