From: bcoconni <bcoconni@users.sourceforge.net>
Date: Fri, 13 Jun 2014 22:29:39 +0000 (+0200)
Subject: Kévin Seroux: C++11 fixes for MSVC++
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d830430e6104ef71c387ae2bffc2b5414049e0d4;p=flightgear.git

Kévin Seroux: C++11 fixes for MSVC++
---

diff --git a/src/FDM/JSBSim/input_output/string_utilities.h b/src/FDM/JSBSim/input_output/string_utilities.h
index 808776101..bdcf74ff4 100644
--- a/src/FDM/JSBSim/input_output/string_utilities.h
+++ b/src/FDM/JSBSim/input_output/string_utilities.h
@@ -49,7 +49,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_STRINGUTILS "$Id: string_utilities.h,v 1.19 2014/01/29 13:30:11 ehofman Exp $"
+#define ID_STRINGUTILS "$Id: string_utilities.h,v 1.20 2014/06/13 22:10:33 bcoconni Exp $"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
@@ -75,7 +75,9 @@ CLASS DECLARATION
   std::vector <std::string> split(std::string str, char d);
 
   // libc++ has these as built-ins for all C++ language versions
-#if !defined(_LIBCPP_VERSION)
+  // as well as Visual Studio for versions greater than 2010
+  // (1700 -> MSVC++ 11.0 and VS 2012)
+#if !defined(_LIBCPP_VERSION) && _MSC_VER < 1700
   extern std::string to_string(int);
   extern std::string to_string(double);
   extern std::string to_string(float);