From 3004dfc8c19fa3f48f466d254a5e0cd442acb4ac Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 29 Aug 2014 18:52:52 -0700
Subject: [PATCH] fix conversions test with msvs 2014

---
 tests/cpp_tests/conversions_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cpp_tests/conversions_test.cpp b/tests/cpp_tests/conversions_test.cpp
index ab1088c31..6f750840a 100644
--- a/tests/cpp_tests/conversions_test.cpp
+++ b/tests/cpp_tests/conversions_test.cpp
@@ -5,13 +5,13 @@
 #include <vector>
 #include <algorithm>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #include <cstdio>
 #endif
 
 int main(int argc, char** argv)
 {
-    #if defined(_MSC_VER)
+    #if defined(_MSC_VER) && _MSC_VER < 1900
     unsigned int old = _set_output_format(_TWO_DIGIT_EXPONENT);
     #endif
     std::vector<std::string> args;