diff options
Diffstat (limited to 'src/3rdparty/assimp/code/StringUtils.h')
| -rw-r--r-- | src/3rdparty/assimp/code/StringUtils.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/code/StringUtils.h b/src/3rdparty/assimp/code/StringUtils.h index 99352ebfb..64f66e6b9 100644 --- a/src/3rdparty/assimp/code/StringUtils.h +++ b/src/3rdparty/assimp/code/StringUtils.h @@ -2,7 +2,8 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. Redistribution and use of this software in source and binary forms, @@ -40,11 +41,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_STRINGUTILS_H #define INCLUDED_AI_STRINGUTILS_H -#include <cstdarg> -#include <string.h> -#include <stdio.h> #include <sstream> -#include <string> +#include <stdarg.h> +#include <cstdlib> /// @fn ai_snprintf /// @brief The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier. @@ -103,7 +102,7 @@ float ai_strtof( const char *begin, const char *end ) { std::string token( begin, len ); val = static_cast< float >( ::atof( token.c_str() ) ); } - + return val; } |