From ce93030b0005df1506bef578bf2c183925c032ca Mon Sep 17 00:00:00 2001
From: Andrew Melim <Andrew.Melim@gatech.edu>
Date: Mon, 24 Nov 2014 13:31:47 -0500
Subject: [PATCH] Correcting warnings on windows

---
 CMakeLists.txt                             |  2 ++
 gtsam/3rdparty/metis-5.1.0/include/metis.h | 14 +++++++++++++-
 gtsam/CMakeLists.txt                       |  4 ++--
 gtsam/inference/MetisIndex-inl.h           |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 951a0ec7e..b2e7aa3d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,8 @@ if(MSVC)
 		add_definitions(-DBOOST_ALL_NO_LIB)
 	  add_definitions(-DBOOST_ALL_DYN_LINK)
 	endif()
+  # Also disable certain warnings
+  add_definitions(/wd4503)
 endif()
 
 find_package(Boost 1.43 COMPONENTS serialization system filesystem thread program_options date_time regex timer chrono)
diff --git a/gtsam/3rdparty/metis-5.1.0/include/metis.h b/gtsam/3rdparty/metis-5.1.0/include/metis.h
index dc5406ae5..2866a946b 100644
--- a/gtsam/3rdparty/metis-5.1.0/include/metis.h
+++ b/gtsam/3rdparty/metis-5.1.0/include/metis.h
@@ -65,17 +65,29 @@
 #ifndef _GKLIB_H_
 #ifdef COMPILER_MSC
 #include <limits.h>
-
 typedef __int32 int32_t;
 typedef __int64 int64_t;
 #define PRId32       "I32d"
 #define PRId64       "I64d"
 #define SCNd32       "ld"
 #define SCNd64       "I64d"
+
+#ifndef INT32_MIN
 #define INT32_MIN    ((int32_t)_I32_MIN)
+#endif
+
+#ifndef INT32_MAX
 #define INT32_MAX    _I32_MAX
+#endif
+
+#ifndef INT64_MIN
 #define INT64_MIN    ((int64_t)_I64_MIN)
+#endif
+
+#ifndef INT64_MAX
 #define INT64_MAX    _I64_MAX
+#endif
+
 #else
 #include <inttypes.h>
 #endif
diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt
index 2d5706f33..d08ded7e8 100644
--- a/gtsam/CMakeLists.txt
+++ b/gtsam/CMakeLists.txt
@@ -5,7 +5,7 @@ set (gtsam_subdirs
     base
     geometry
     inference
-	symbolic
+	  symbolic
     discrete
     linear
     nonlinear
@@ -69,7 +69,7 @@ set(gtsam_srcs
     ${base_srcs}
     ${geometry_srcs}
     ${inference_srcs}
-	${symbolic_srcs}
+	  ${symbolic_srcs}
     ${discrete_srcs}
     ${linear_srcs}
     ${nonlinear_srcs}
diff --git a/gtsam/inference/MetisIndex-inl.h b/gtsam/inference/MetisIndex-inl.h
index a8e9aef2f..0be1c503c 100644
--- a/gtsam/inference/MetisIndex-inl.h
+++ b/gtsam/inference/MetisIndex-inl.h
@@ -78,7 +78,7 @@ void MetisIndex::augment(const FactorGraph<FACTOR>& factors)
 		// Insert each index's set in order by appending them to the end of adj_
 		adj_.insert(adj_.end(), temp.begin(), temp.end());
 		//adj_.push_back(temp);
-		xadj_.push_back(adj_.size());
+		xadj_.push_back((idx_t)adj_.size());
 	}
 }