Merge fbb2bee into merged_master (Bitcoin PR #20067)

RGGH · May 6, 2021 · 155b09b · 155b09b
2 parents 9662170 + fbb2bee
commit 155b09b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -15,7 +15,6 @@
 #include <version.h>
 
 #include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 
 #include <algorithm>
@@ -40,8 +39,9 @@ CScript ParseScript(const std::string& s)
                 continue;
             mapOpNames[strName] = static_cast<opcodetype>(op);
             // Convenience: OP_ADD and just ADD are both recognized:
-            boost::algorithm::replace_first(strName, "OP_", "");
-            mapOpNames[strName] = static_cast<opcodetype>(op);
+            if (strName.compare(0, 3, "OP_") == 0) {  // strName starts with "OP_"
+                mapOpNames[strName.substr(3)] = static_cast<opcodetype>(op);
+            }
         }
     }