Modify RE2 storage to avoid program shutdown crash

NREL · Mar 29, 2021 · b311778 · b311778 · nrel-bot-3 · Mar 29, 2021
1 parent 8452fa2
commit b311778
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/EnergyPlus/DataOutputs.cc b/src/EnergyPlus/DataOutputs.cc
@@ -145,8 +145,8 @@ namespace EnergyPlus::DataOutputs {
             break;
         }
         if (is_simple_string) return;
-        pattern = std::unique_ptr<RE2>(new RE2(KeyValue));
-        case_insensitive_pattern = std::unique_ptr<RE2>(new RE2("(?i)" + KeyValue));
+        pattern = new RE2(KeyValue);
+        case_insensitive_pattern = new RE2("(?i)" + KeyValue);
         if (!pattern->ok()) {
             ShowSevereError(state, "Regular expression \"" + KeyValue + "\" for variable name \"" + VariableName + "\" in input file is incorrect");
             ShowContinueError(state, pattern->error());

diff --git a/src/EnergyPlus/DataOutputs.hh b/src/EnergyPlus/DataOutputs.hh
@@ -78,8 +78,8 @@ namespace DataOutputs {
         std::string const key;
         std::string const variableName;
         bool is_simple_string = true;
-        std::unique_ptr<RE2> pattern;
-        std::unique_ptr<RE2> case_insensitive_pattern;
+        RE2 * pattern;
+        RE2 * case_insensitive_pattern;
     };
 
     // Check if a KeyValue/VariableName is inside the map OutputVariablesForSimulation