Remove warnings with llvm 8.0 of macos

src/artis/builder/ModelFactory.hpp

@@ -90,7 +90,7 @@ public:
 
     bool remove(const I& id)
     {
-/*        std::lock_guard < std::mutex > lock(_mutex);
+        std::lock_guard < std::mutex > lock(_mutex);
         typename Creators::const_iterator it = creators.find(id);
 
         if (it != creators.end()) {
@@ -98,8 +98,7 @@ public:
             return true;
         } else {
             return false;
-            } */
-        return false;
+        }
     }
 
 private:

src/artis/kernel/AbstractAtomicModel.hpp

@@ -43,6 +43,13 @@ class AbstractAtomicModel : public AbstractModel < U, V >,
 {
     typedef AbstractModel < U, V > type;
 
+    using Externals < T, U, V >::restore;
+    using Internals < T, U, V >::restore;
+    using States < T, U, V >::restore;
+    using Externals < T, U, V >::save;
+    using Internals < T, U, V >::save;
+    using States < T, U, V >::save;
+
 public:
     AbstractAtomicModel(const type* parent = 0) : type(parent)
     {

src/artis/kernel/AbstractCoupledModel.hpp

@@ -52,6 +52,13 @@ class AbstractCoupledModel : public AbstractModel < U, V >,
     typedef std::map < int, std::pair < type*,
                                         int > > SubModelInternals;
 
+    using Externals < T, U, V >::restore;
+    using Internals < T, U, V >::restore;
+    using States < T, U, V >::restore;
+    using Externals < T, U, V >::save;
+    using Internals < T, U, V >::save;
+    using States < T, U, V >::save;
+
 #ifdef WITH_TRACE
     friend class Simulator < T, U, V, W >;
 #endif