Merge pull request #538 from tautschnig/fix-531-532

VisualStudio build fixes

Author: forejtv

src/goto-programs/goto_program_template.h

@@ -216,8 +216,15 @@ class goto_program_templatet
     }
 
     //! Uniquely identify an invalid target or location
+    #if (defined _MSC_VER && _MSC_VER <= 1800)
+    // Visual Studio <= 2013 does not support constexpr, making
+    // numeric_limits::max() unviable for a static const member
+    static const unsigned nil_target=
+      static_cast<unsigned>(-1);
+    #else
     static const unsigned nil_target=
       std::numeric_limits<unsigned>::max();
+    #endif
 
     //! A globally unique number to identify a program location.
     //! It's guaranteed to be ordered in program order within

src/goto-programs/remove_static_init_loops.cpp

@@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 \*******************************************************************/
 
+#include <algorithm>
+
 #include <util/message.h>
 #include <util/suffix.h>
 #include <util/string2int.h>

src/solvers/prop/aig.cpp

@@ -8,7 +8,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <cassert>
 #include <ostream>
-
+#include <string>
 
 #include "aig.h"