fix some warnings

Author: patrickbr

CMakeLists.txt

@@ -28,11 +28,11 @@ find_package(LibZip)
 
 # set compiler flags, see http://stackoverflow.com/questions/7724569/debug-vs-release-in-cmake
 if(OPENMP_FOUND)
-	set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} -O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wno-keyword-macro -Wformat-security -Wformat=2")
+	set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} -O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2")
 
 else()
 	message(STATUS "Configuring without OpenMP")
-	set(CMAKE_CXX_FLAGS "-O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wno-keyword-macro -Wformat-security -Wformat=2")
+	set(CMAKE_CXX_FLAGS "-O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2")
 endif()
 
 if(GUROBI_FOUND)

src/loom/optim/ExhaustiveOptimizer.cpp

@@ -3,6 +3,8 @@
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 #include <algorithm>
+#include <random>
+#include <chrono>
 #include <unordered_map>
 
 #include "loom/optim/ExhaustiveOptimizer.h"
@@ -130,6 +132,9 @@ void ExhaustiveOptimizer::initialConfig(const std::set<OptNode*>& g,
 // _____________________________________________________________________________
 void ExhaustiveOptimizer::initialConfig(const std::set<OptNode*>& g,
                                         OptOrderCfg* cfg, bool sorted) const {
+  auto seed = std::chrono::system_clock::now().time_since_epoch().count();
+  auto randEng = std::default_random_engine(seed);
+
   for (OptNode* n : g) {
     for (OptEdge* e : n->getAdjList()) {
       if (e->getFrom() != n) continue;
@@ -143,7 +148,7 @@ void ExhaustiveOptimizer::initialConfig(const std::set<OptNode*>& g,
       if (sorted) {
         std::sort((*cfg)[e].begin(), (*cfg)[e].end());
       } else {
-        std::random_shuffle((*cfg)[e].begin(), (*cfg)[e].end());
+        std::shuffle((*cfg)[e].begin(), (*cfg)[e].end(), randEng);
       }
     }
   }

src/loom/optim/OptGraph.cpp

@@ -676,7 +676,8 @@ size_t OptGraph::getNumLines() const {
   for (auto n : getNds()) {
     for (auto e : n->getAdjList()) {
       if (e->getFrom() != n) continue;
-      for (auto to : getFirstLnEdgPart(e).lnEdg->pl().getLines()) {
+      auto ep = getFirstLnEdgPart(e).lnEdg;
+      for (auto to : ep->pl().getLines()) {
         lines.insert(to.line);
       }
     }