From 46c23806846c957c94379a38927731eddf8aab0a Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 13 Feb 2017 10:28:37 +0000
Subject: [PATCH 1/3] Add missing <string> header for std::to_string

Fixes #532.
---
 src/solvers/prop/aig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/solvers/prop/aig.cpp b/src/solvers/prop/aig.cpp
index 5d5c9839f8e..1b6d186d271 100644
--- a/src/solvers/prop/aig.cpp
+++ b/src/solvers/prop/aig.cpp
@@ -8,7 +8,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <cassert>
 #include <ostream>
-
+#include <string>
 
 #include "aig.h"
 

From b2e5c0dd3896f7194214d2019db2aa17f42b37b7 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 13 Feb 2017 10:35:44 +0000
Subject: [PATCH 2/3] Work around VS2013's lack of constexpr support

Fixes #531.
---
 src/goto-programs/goto_program_template.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/goto-programs/goto_program_template.h b/src/goto-programs/goto_program_template.h
index 8dd62262e33..94ef7c8a297 100644
--- a/src/goto-programs/goto_program_template.h
+++ b/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

From 50f7eb1a7d28940835c1435b38e397e42365aa3c Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 13 Feb 2017 11:32:45 +0000
Subject: [PATCH 3/3] Include <algorithm> to provide std::max

---
 src/goto-programs/remove_static_init_loops.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/goto-programs/remove_static_init_loops.cpp b/src/goto-programs/remove_static_init_loops.cpp
index f1084d6ca53..3e529c75026 100644
--- a/src/goto-programs/remove_static_init_loops.cpp
+++ b/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>