rpc: Replace boost::variant with std::variant for RPCArg.m_fallback

MarcoFalke · MarcoFalke · commit fa749fbea3ca · 2021-01-01T15:08:07.000+01:00
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020 The Bitcoin Core developers
+// Copyright (c) 2017-2021 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -562,10 +562,10 @@ std::string RPCArg::GetName() const
 
 bool RPCArg::IsOptional() const
 {
-    if (m_fallback.which() == 1) {
+    if (m_fallback.index() == 1) {
         return true;
     } else {
-        return RPCArg::Optional::NO != boost::get<RPCArg::Optional>(m_fallback);
+        return RPCArg::Optional::NO != std::get<RPCArg::Optional>(m_fallback);
     }
 }
 
@@ -609,10 +609,10 @@ std::string RPCArg::ToDescriptionString() const
         }
         } // no default case, so the compiler can warn about missing cases
     }
-    if (m_fallback.which() == 1) {
-        ret += ", optional, default=" + boost::get<std::string>(m_fallback);
+    if (m_fallback.index() == 1) {
+        ret += ", optional, default=" + std::get<std::string>(m_fallback);
     } else {
-        switch (boost::get<RPCArg::Optional>(m_fallback)) {
+        switch (std::get<RPCArg::Optional>(m_fallback)) {
         case RPCArg::Optional::OMITTED: {
             // nothing to do. Element is treated as if not present and has no default value
             break;
diff --git a/src/rpc/util.h b/src/rpc/util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020 The Bitcoin Core developers
+// Copyright (c) 2017-2021 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -19,10 +19,9 @@
 #include <util/check.h>
 
 #include <string>
+#include <variant>
 #include <vector>
 
-#include <boost/variant.hpp>
-
 /**
  * String used to describe UNIX epoch time in documentation, factored out to a
  * constant for consistency.
@@ -144,7 +143,7 @@ struct RPCArg {
          */
         OMITTED,
     };
-    using Fallback = boost::variant<Optional, /* default value for optional args */ std::string>;
+    using Fallback = std::variant<Optional, /* default value for optional args */ std::string>;
     const std::string m_names; //!< The name of the arg (can be empty for inner args, can contain multiple aliases separated by | for named request arguments)
     const Type m_type;
     const bool m_hidden;
diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
@@ -77,4 +77,6 @@ implicit-signed-integer-truncation:test/skiplist_tests.cpp
 implicit-signed-integer-truncation:torcontrol.cpp
 implicit-unsigned-integer-truncation:crypto/*
 implicit-unsigned-integer-truncation:leveldb/*
+# std::variant warning fixed in https://github.com/gcc-mirror/gcc/commit/074436cf8cdd2a9ce75cadd36deb8301f00e55b9
+implicit-unsigned-integer-truncation:std::__detail::__variant::_Variant_storage
 implicit-integer-sign-change:crc32c/*

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2017-2020 The Bitcoin Core developers`
	`1`	`+// Copyright (c) 2017-2021 The Bitcoin Core developers`
`2`	`2`	`// Distributed under the MIT software license, see the accompanying`
`3`	`3`	`// file COPYING or http://www.opensource.org/licenses/mit-license.php.`
`4`	`4`
`@@ -562,10 +562,10 @@ std::string RPCArg::GetName() const`
`562`	`562`
`563`	`563`	`bool RPCArg::IsOptional() const`
`564`	`564`	`{`
`565`		`- if (m_fallback.which() == 1) {`
	`565`	`+ if (m_fallback.index() == 1) {`
`566`	`566`	`return true;`
`567`	`567`	`} else {`
`568`		`- return RPCArg::Optional::NO != boost::get<RPCArg::Optional>(m_fallback);`
	`568`	`+ return RPCArg::Optional::NO != std::get<RPCArg::Optional>(m_fallback);`
`569`	`569`	`}`
`570`	`570`	`}`
`571`	`571`
`@@ -609,10 +609,10 @@ std::string RPCArg::ToDescriptionString() const`
`609`	`609`	`}`
`610`	`610`	`} // no default case, so the compiler can warn about missing cases`
`611`	`611`	`}`
`612`		`- if (m_fallback.which() == 1) {`
`613`		`- ret += ", optional, default=" + boost::get<std::string>(m_fallback);`
	`612`	`+ if (m_fallback.index() == 1) {`
	`613`	`+ ret += ", optional, default=" + std::get<std::string>(m_fallback);`
`614`	`614`	`} else {`
`615`		`- switch (boost::get<RPCArg::Optional>(m_fallback)) {`
	`615`	`+ switch (std::get<RPCArg::Optional>(m_fallback)) {`
`616`	`616`	`case RPCArg::Optional::OMITTED: {`
`617`	`617`	`// nothing to do. Element is treated as if not present and has no default value`
`618`	`618`	`break;`