From 826ea8139f6597f2d73cf3c7b1c8670728789d36 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Fri, 14 Feb 2014 17:42:50 +0000
Subject: [PATCH] Re-apply the Clang/C+11 fix for JSBSim

Hopefully an equivalent change will occur upstream before the next
JSBsim sync.
---
 src/FDM/JSBSim/input_output/string_utilities.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/FDM/JSBSim/input_output/string_utilities.h b/src/FDM/JSBSim/input_output/string_utilities.h
index d25e258b3..9bb120b04 100644
--- a/src/FDM/JSBSim/input_output/string_utilities.h
+++ b/src/FDM/JSBSim/input_output/string_utilities.h
@@ -73,10 +73,14 @@ CLASS DECLARATION
   extern std::string& to_lower(std::string& str);
   extern bool is_number(const std::string& str);
   std::vector <std::string> split(std::string str, char d);
-/* Comment out to_string functions when they are defined already - C++ 11 defines these */
+
+// libc++ has these as built-ins for all C++ language versions
+#if !defined(_LIBCPP_VERSION)
   extern std::string to_string(int);
   extern std::string to_string(double);
   extern std::string to_string(float);
+#endif
+
   extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
 #else
   #include <cctype>