Remote unneeded headers, remove string utils

src/axom/core/CMakeLists.txt

@@ -8,7 +8,6 @@
 ################################
 set(core_headers
     utilities/FileUtilities.hpp
-    utilities/StringUtilities.hpp
     utilities/Timer.hpp
     utilities/Utilities.hpp
     utilities/About.hpp
@@ -38,7 +37,6 @@ set(core_headers
 
 set(core_sources
     utilities/FileUtilities.cpp
-    utilities/StringUtilities.cpp
     utilities/Utilities.cpp
     utilities/About.cpp
 

src/axom/core/utilities/FileUtilities.hpp

@@ -7,7 +7,6 @@
 #define COMMON_FILE_UTILITIES_H_
 
 #include <string>
-#include <sys/stat.h>
 
 namespace axom
 {

src/axom/lumberjack/BinaryTreeCommunicator.cpp

@@ -17,10 +17,10 @@
 
 #include "axom/core/utilities/Utilities.hpp"
 
-#include <cstdlib>
-#include <cmath>
+#include "mpi.h"
 
 #include "axom/lumberjack/MPIUtility.hpp"
+#include "axom/lumberjack/Message.hpp"
 
 namespace axom
 {

src/axom/lumberjack/BinaryTreeCommunicator.hpp

@@ -14,12 +14,9 @@
 #ifndef BINARYTREECOMMUNICATOR_HPP
 #define BINARYTREECOMMUNICATOR_HPP
 
-#include <string>
-
 #include "mpi.h"
 
 #include "axom/lumberjack/Communicator.hpp"
-#include "axom/lumberjack/Message.hpp"
 
 namespace axom
 {

src/axom/lumberjack/Lumberjack.cpp

@@ -15,8 +15,6 @@
 
 #include "axom/lumberjack/Lumberjack.hpp"
 
-#include "axom/core/utilities/StringUtilities.hpp"
-
 namespace axom
 {
 namespace lumberjack

src/axom/lumberjack/MPIUtility.cpp

@@ -15,7 +15,6 @@
 
 #include "axom/lumberjack/MPIUtility.hpp"
 
-#include <cstdlib>
 #include <cstring>
 
 namespace axom

src/axom/lumberjack/Message.cpp

@@ -15,10 +15,9 @@
 
 #include "axom/lumberjack/Message.hpp"
 
-#include "axom/core/utilities/StringUtilities.hpp"
-
 #include <algorithm>
 #include <iostream>
+#include <string>
 
 namespace axom
 {
@@ -68,7 +67,7 @@ std::string Message::stringOfRanks(std::string delimiter) const
   int ranksSize = m_ranks.size();
   for(int i=0 ; i<ranksSize ; ++i)
   {
-    returnString += axom::utilities::string::intToString(m_ranks[i]);
+    returnString += std::to_string(m_ranks[i]);
     if (i < (ranksSize-1))
     {
       returnString += delimiter;
@@ -153,27 +152,25 @@ std::string Message::pack()
   int ranksSize = (int)m_ranks.size();
   for (int i=0 ; i<ranksSize ; ++i)
   {
-    packedMessage += axom::utilities::string::intToString(m_ranks[i]);
+    packedMessage += std::to_string(m_ranks[i]);
     if (i < (ranksSize-1))
     {
       packedMessage += rankDelimiter;
     }
   }
   packedMessage += memberDelimiter;
 
-  packedMessage += axom::utilities::string::intToString(m_ranksCount) +
-                   memberDelimiter;
+  packedMessage += std::to_string(m_ranksCount) + memberDelimiter;
 
   packedMessage += m_fileName + memberDelimiter;
 
   if (m_lineNumber > 0)
   {
-    packedMessage += axom::utilities::string::intToString(m_lineNumber);
+    packedMessage += std::to_string(m_lineNumber);
   }
   packedMessage += memberDelimiter;
 
-  packedMessage += axom::utilities::string::intToString(m_level) +
-                   memberDelimiter;
+  packedMessage += std::to_string(m_level) + memberDelimiter;
 
   packedMessage += m_tag + memberDelimiter;
 
@@ -208,9 +205,7 @@ void Message::unpack(const std::string& packedMessage, int ranksLimit)
               << std::endl;
     std::cerr << packedMessage << std::endl;
   }
-  m_ranksCount =
-    axom::utilities::string::stringToInt(packedMessage.substr(start,
-                                                              end-start));
+  m_ranksCount = std::stoi(packedMessage.substr(start, end-start));
   start = end + 1;
 
   //Grab file name
@@ -236,9 +231,7 @@ void Message::unpack(const std::string& packedMessage, int ranksLimit)
   }
   if (end-start > 0)
   {
-    m_lineNumber =
-      axom::utilities::string::stringToInt(packedMessage.substr(start,
-                                                                end-start));
+    m_lineNumber = std::stoi(packedMessage.substr(start, end-start));
   }
   start = end + 1;
 
@@ -251,9 +244,7 @@ void Message::unpack(const std::string& packedMessage, int ranksLimit)
               << std::endl;
     std::cerr << packedMessage << std::endl;
   }
-  m_level =
-    axom::utilities::string::stringToInt(packedMessage.substr(start,
-                                                              end-start));
+  m_level = std::stoi(packedMessage.substr(start, end-start));
   start = end + 1;
 
   //Grab tag
@@ -288,15 +279,12 @@ void Message::unpackRanks(const std::string& ranksString, int ranksLimit)
   {
     if (end == std::string::npos)
     {
-      addRank(axom::utilities::string::stringToInt(ranksString.substr(
-                                                     start)), ranksLimit);
+      addRank(std::stoi(ranksString.substr(start)), ranksLimit);
       break;
     }
     else
     {
-      addRank(axom::utilities::string::stringToInt(ranksString.substr(start,
-                                                                      end-start)),
-              ranksLimit);
+      addRank(std::stoi(ranksString.substr(start, end-start)), ranksLimit);
     }
     start = end + 1;
     end = ranksString.find(rankDelimiter, start);
@@ -322,14 +310,13 @@ const char* packMessages(const std::vector<Message*>& messages)
   {
     packedMessages.push_back(messages[i]->pack());
     currSize = packedMessages[i].size();
-    sizeStrings.push_back(axom::utilities::string::intToString(currSize));
+    sizeStrings.push_back(std::to_string(currSize));
     //           message size + size string size + memberDelimiter size
     totalSize += currSize + sizeStrings[i].size() + 1;
   }
 
   // Create and calculate size of message count
-  std::string messageCountString =
-    axom::utilities::string::intToString(messageCount) + memberDelimiter;
+  std::string messageCountString = std::to_string(messageCount) + memberDelimiter;
   totalSize += messageCountString.size();
 
   const char* packedMessagesString = new char[totalSize];
@@ -371,7 +358,7 @@ void unpackMessages(std::vector<Message*>& messages,
   // Get message count
   end = packedMessagesString.find(memberDelimiter);
   tempSubString = packedMessagesString.substr(0, end);
-  int messageCount = axom::utilities::string::stringToInt(tempSubString);
+  int messageCount = std::stoi(tempSubString);
   start = end + 1;
 
   // Grab each message
@@ -382,7 +369,7 @@ void unpackMessages(std::vector<Message*>& messages,
     //Get current message size
     end = packedMessagesString.find(memberDelimiter, start);
     tempSubString = packedMessagesString.substr(start, end-start);
-    messageSize = axom::utilities::string::stringToInt(tempSubString);
+    messageSize = std::stoi(tempSubString);
     start = end + 1;
 
     //Create current message and save

src/axom/lumberjack/tests/lumberjack_Lumberjack.cpp

@@ -10,8 +10,6 @@
 #include "axom/lumberjack/Communicator.hpp"
 #include "axom/lumberjack/Message.hpp"
 
-#include "axom/core/utilities/StringUtilities.hpp"
-
 #include <stdlib.h>
 #include <time.h>
 
@@ -266,7 +264,7 @@ TEST(lumberjack_Lumberjack, combineMessages03)
   for(int i=0 ; i<6 ; ++i)
   {
     std::string s = "Should not be combined " +
-                    axom::utilities::string::intToString(i+1) + ".";
+                    std::to_string(i+1) + ".";
     EXPECT_EQ(messages[i]->text(), s);
     EXPECT_EQ(messages[i]->ranksCount(), 1);
   }
@@ -299,7 +297,7 @@ TEST(lumberjack_Lumberjack, combineMixedMessages01)
   for(int i=0 ; i<2 ; ++i)
   {
     std::string s = "Should not be combined " +
-                    axom::utilities::string::intToString(i+1) + ".";
+                    std::to_string(i+1) + ".";
     EXPECT_EQ(messages[i]->text(), s);
     EXPECT_EQ(messages[i]->ranksCount(), 1);
   }
@@ -338,7 +336,7 @@ TEST(lumberjack_Lumberjack, combineMixedMessages02)
   for(int i=0 ; i<2 ; ++i)
   {
     std::string s = "Should not be combined " +
-                    axom::utilities::string::intToString(i+1) + ".";
+                    std::to_string(i+1) + ".";
     EXPECT_EQ(messages[i]->text(), s);
     EXPECT_EQ(messages[i]->ranksCount(), 1);
   }
@@ -381,7 +379,7 @@ TEST(lumberjack_Lumberjack, combineMixedMessages03)
   for(int i=1 ; i<3 ; ++i)
   {
     std::string s = "Should not be combined " +
-                    axom::utilities::string::intToString(i+1) + ".";
+                    std::to_string(i+1) + ".";
     EXPECT_EQ(messages[i]->text(), s);
     EXPECT_EQ(messages[i]->ranksCount(), 1);
   }
@@ -406,7 +404,7 @@ TEST(lumberjack_Lumberjack, combineMessagesManyMessages)
   for(int i=0 ; i<loopCount ; ++i)
   {
     std::string s = "Should not be combined " +
-                    axom::utilities::string::intToString(i) + ".";
+                    std::to_string(i) + ".";
     lumberjack.queueMessage(s);
   }
 
@@ -418,7 +416,7 @@ TEST(lumberjack_Lumberjack, combineMessagesManyMessages)
   for(int i=0 ; i<loopCount ; ++i)
   {
     std::string s = "Should not be combined " +
-                    axom::utilities::string::intToString(i) + ".";
+                    std::to_string(i) + ".";
     EXPECT_EQ(messages[i]->text(), s);
     EXPECT_EQ(messages[i]->ranksCount(), 1);
   }
@@ -445,7 +443,7 @@ TEST(lumberjack_Lumberjack, combineMessagesLargeMessages)
 
   for(int i=0 ; i<loopCount ; ++i)
   {
-    std::string s = axom::utilities::string::intToString(i) + ":" + padding;
+    std::string s = std::to_string(i) + ":" + padding;
     lumberjack.queueMessage(s);
   }
 
@@ -456,7 +454,7 @@ TEST(lumberjack_Lumberjack, combineMessagesLargeMessages)
   EXPECT_EQ((int)messages.size(), loopCount);
   for(int i=0 ; i<loopCount ; ++i)
   {
-    std::string s = axom::utilities::string::intToString(i) + ":" + padding;
+    std::string s = std::to_string(i) + ":" + padding;
     EXPECT_EQ(messages[i]->text(), s);
     EXPECT_EQ(messages[i]->ranksCount(), 1);
   }

src/axom/lumberjack/tests/lumberjack_speedTest.cpp

@@ -8,8 +8,6 @@
 #include "axom/lumberjack/RootCommunicator.hpp"
 #include "axom/lumberjack/Message.hpp"
 
-#include "axom/core/utilities/StringUtilities.hpp"
-
 #include <mpi.h>
 
 #include <ctime>
@@ -33,7 +31,7 @@ int main(int argc, char** argv)
     return 1;
   }
   std::string communicatorName = "";
-  int cycleLimit = axom::utilities::string::stringToInt(argv[2]);
+  int cycleLimit = std::stoi(argv[2]);
   char* fileName = argv[3];
 
   if (std::string(argv[1]) == "b")

src/axom/slic/streams/LumberjackStream.cpp

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "axom/core/Macros.hpp"
-#include "axom/core/utilities/StringUtilities.hpp"
 
 #include "axom/lumberjack/BinaryTreeCommunicator.hpp"
 #include "axom/lumberjack/Lumberjack.hpp"