Merge branch 'icc-fix'

include/diy/factory.hpp

@@ -37,11 +37,14 @@ class Factory
                 };
                 return true;
             }
-            static bool registered;
+            static volatile bool registered;
 
             std::string id() const override     { return typeid(T).name(); }
 
             private:
+#if defined(__INTEL_COMPILER)
+                __attribute__ ((used))
+#endif
                 Registrar(): Base(Key{}) { (void)registered; }
         };
 
@@ -67,7 +70,7 @@ class Factory
 
 template <class Base, class... Args>
 template <class T>
-bool Factory<Base, Args...>::Registrar<T>::registered = Factory<Base, Args...>::Registrar<T>::registerT();
+volatile bool Factory<Base, Args...>::Registrar<T>::registered = Factory<Base, Args...>::Registrar<T>::registerT();
 
 }
 

include/diy/mpi.hpp

@@ -42,7 +42,7 @@ diy::mpi::environment::
 environment(int threading)
 {
 #ifndef DIY_NO_MPI
-  int argc = 0; char** argv;
+  int argc = 0; char** argv = { NULL };
   MPI_Init_thread(&argc, &argv, threading, &provided_threading);
 #else
   provided_threading = threading;