fly/flightgear
1
0
Fork 0
Code Activity

clang / libc++ fixes for JSBSim

Browse source 
(needs to be upstreamed too)
This commit is contained in:
James Turner 2014-01-25 10:34:19 +00:00
parent da05f403b1
commit 64cbc06003
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/FDM/JSBSim/input_output/string_utilities.h
View file

@ -73,10 +73,14 @@ CLASS DECLARATION
extern std::string& to_lower(std::string& str); extern std::string& to_lower(std::string& str);
extern bool is_number(const std::string& str); extern bool is_number(const std::string& str);
std::vector <std::string> split(std::string str, char d); 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(int);
extern std::string to_string(double); extern std::string to_string(double);
extern std::string to_string(float); extern std::string to_string(float);
#endif
extern std::string replace(std::string str, const std::string& old, const std::string& newstr); extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
#else #else
#include <cctype> #include <cctype>

2
src/FDM/JSBSim/models/FGSurface.cpp
View file

@ -64,7 +64,7 @@ FGSurface::FGSurface()
isSolid = true; isSolid = true;
} }
FGSurface::FGSurface(FGFDMExec* fdmex = NULL) FGSurface::FGSurface(FGFDMExec* fdmex)
{ {
frictionFactor = 1.0; frictionFactor = 1.0;
rollingFCoeff = 0.02; rollingFCoeff = 0.02;