Windows defines and includes added

src/artis/context/Value.hpp

@@ -28,10 +28,9 @@
 
 #include <algorithm>
 #include <typeinfo>
+#include <cstring>
 #if WIN32
 #include <string>
-#else
-#include <cstring>
 #endif
 namespace artis { namespace context {
 

src/artis/kernel/AbstractModel.hpp

@@ -30,6 +30,9 @@
 #include <boost/core/demangle.hpp>
 
 #include <typeinfo>
+#if WIN32
+#include <iso646.h>
+#endif
 
 namespace artis { namespace kernel {
 

src/artis/kernel/Externals.hpp

@@ -27,7 +27,9 @@
 #include <artis/kernel/Macro.hpp>
 
 #include <vector>
-
+#if WIN32
+#include <iso646.h>
+#endif
 namespace artis { namespace kernel {
 
 template < typename T, typename U, typename V >

src/test/models.hpp

@@ -20,14 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef TEST_MODELS_HPP
+#define TEST_MODELS_HPP
+
 #include <artis/kernel/AbstractAtomicModel.hpp>
 #include <artis/kernel/AbstractCoupledModel.hpp>
 #include <artis/utils/Trace.hpp>
 
 #include <memory>
 
-#ifndef TEST_MODELS_HPP
-#define TEST_MODELS_HPP
 
 struct GlobalParameters
 { };