Merge pull request #87 from njoy/bugfix/MATXSR

Bugfix/matxsr
njoy · May 29, 2019 · 2e68016 · 2e68016
2 parents 6512f1e + 5d1697a
commit 2e68016
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/dependencies/ENDFtk b/dependencies/ENDFtk
diff --git a/dependencies/utility b/dependencies/utility
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 ) + "." +
+34 −43		.travis.yml
+11 −14		.travis/build.sh
+29 −0		.travis/signature.sh
+0 −4		README.md