Removed more boost code; removed dead extractFunctionArgumentsNormali…

…zation
passlab · Sep 13, 2023 · 7ee1563 · 7ee1563
1 parent c2c3d20
commit 7ee1563
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 747 deletions.
diff --git a/src/midend/programTransformation/CMakeLists.txt b/src/midend/programTransformation/CMakeLists.txt
@@ -7,7 +7,6 @@ add_subdirectory(astInlining)
 add_subdirectory(astOutlining)
 add_subdirectory(ompLowering)
 add_subdirectory(transformationTracking)
-add_subdirectory(extractFunctionArgumentsNormalization)
 add_subdirectory(singleStatementToBlockNormalization)
 if(NOT enable-internalFrontendDevelopment)
   add_subdirectory(loopProcessing)

diff --git a/src/midend/programTransformation/astOutlining/GenerateFunc.cc b/src/midend/programTransformation/astOutlining/GenerateFunc.cc
@@ -22,6 +22,7 @@
 #include <sstream>
 #include <set>
 #include <map>
+#include <unordered_map>
 
 #include "Outliner.hh"
 #include "ASTtools.hh"
@@ -1397,8 +1398,8 @@ class SymbolMapOfTwoFiles
           dict[i1->second]=i2->second;
 #endif          
         rose_hash_multimap::iterator i1, i2;
-        boost::unordered_map<string, SgVariableSymbol*> varSymDict; 
-        boost::unordered_map<string, SgFunctionSymbol*> funcSymDict; 
+        std::unordered_map<string, SgVariableSymbol*> varSymDict; 
+        std::unordered_map<string, SgFunctionSymbol*> funcSymDict; 
 
         // cache mapping of new symbols,indexed by qualified name : qualified name to symbol
         for (i2=set2->begin(); i2!=set2->end(); i2++)

diff --git a/src/midend/programTransformation/astOutlining/PragmaInterface.cc b/src/midend/programTransformation/astOutlining/PragmaInterface.cc
@@ -19,7 +19,7 @@
 #include "Outliner.hh"
 #include "ASTtools.hh"
 #include "PreprocessingInfo.hh"
-#include <boost/algorithm/string/trim.hpp>
+#include <StringUtility/Trim.h>
 
 //! Simplest outlining directives, applied to a single statement.
 static const std::string PRAGMA_OUTLINE ("rose_outline");
@@ -89,7 +89,7 @@ processFortranComment(SgLocatedNode* node)
     if ((*i)->getTypeOfDirective() == PreprocessingInfo::FortranStyleComment)
     {
       string commentString = (*i)->getString();
-      boost::algorithm::trim(commentString);
+      trim(commentString);
       if (   (commentString == "!$"+PRAGMA_OUTLINE) 
           || (commentString == "c$"+PRAGMA_OUTLINE) 
           || (commentString == "*$"+PRAGMA_OUTLINE)) 

diff --git a/src/midend/programTransformation/extractFunctionArgumentsNormalization/CMakeLists.txt b/src/midend/programTransformation/extractFunctionArgumentsNormalization/CMakeLists.txt