Merge pull request #87 from njoy/bugfix/MATXSR

jlconlin · web-flow · commit 2e68016c1a78 · 2019-05-29T10:27:59.000-06:00
Bugfix/matxsr
diff --git a/dependencies/ENDFtk b/dependencies/ENDFtk
@@ -1 +1 @@
-Subproject commit 67bf15b510ab42a49ed4052e3d878be276db0c65
+Subproject commit 7a6f56edb1771db49c155dd324dbb22d01c5a82a
diff --git a/dependencies/utility b/dependencies/utility
@@ -1 +1 @@
-Subproject commit bf9d859268d9d34802015d1ea2ea707da666c37a
+Subproject commit 361c72300422aa1c9e7b00cf9be3b6c885871a40
diff --git a/src/njoy21.hpp b/src/njoy21.hpp
@@ -2,9 +2,10 @@
 #define NJOY21
 
 #include <variant>
+#include <map>
 
 
-#ifdef USING_CPP17
+#if __cplusplus >= 201703L
   #include <optional>
 #else 
   #include <experimental/optional>
diff --git a/src/njoy21/Version.hpp b/src/njoy21/Version.hpp
@@ -4,7 +4,7 @@ class Version{
   // Change whenever new capability is implemented
   static constexpr int minorVersion{0};
   // Change whenever merge to master branch is done
-  static constexpr int patchVersion{1};
+  static constexpr int patchVersion{2};
 
   static std::string version(){ 
     return std::to_string( majorVersion ) + "." + 
