[DEBUG] correct .hpp port + clean libC include

This commit is contained in:
Edouard DUPIN 2016-10-02 23:48:39 +02:00
parent 4ba1f5df60
commit 9a40eb9b95
6 changed files with 13 additions and 13 deletions

View File

@ -13,7 +13,7 @@
#include <time.h> #include <time.h>
#include <cmath> #include <cmath>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <cstdlib>
etk::BaseNoise::BaseNoise(const ivec2& _size, float _min, float _max) : etk::BaseNoise::BaseNoise(const ivec2& _size, float _min, float _max) :
m_data(_size.x()*_size.y()), m_data(_size.x()*_size.y()),

View File

@ -10,7 +10,7 @@
#include <etk/math/Vector3D.hpp> #include <etk/math/Vector3D.hpp>
#include <math.h> #include <cmath>
namespace etk { namespace etk {
/** /**

View File

@ -7,7 +7,7 @@
#include <etk/types.hpp> #include <etk/types.hpp>
#include <math.h> #include <cmath>
#ifdef ETK_BUILD_LINEARMATH #ifdef ETK_BUILD_LINEARMATH
#include <LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
#include <LinearMath/btMinMax.h> #include <LinearMath/btMinMax.h>

View File

@ -8,7 +8,7 @@
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/os/FSNode.hpp> #include <etk/os/FSNode.hpp>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <cstdlib>
#include <etk/tool.hpp> #include <etk/tool.hpp>
#include <etk/debug.hpp> #include <etk/debug.hpp>
#include <map> #include <map>
@ -22,7 +22,7 @@ extern "C" {
// file browsing ... // file browsing ...
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <cerrno>
} }
#ifdef HAVE_ZIP_DATA #ifdef HAVE_ZIP_DATA

View File

@ -10,7 +10,7 @@
#include <time.h> #include <time.h>
#include <cmath> #include <cmath>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <cstdlib>
double etk::tool::frand(double _a, double _b) { double etk::tool::frand(double _a, double _b) {
return (float)(( (double)rand()/(double)RAND_MAX ) * ((double)_b-(double)_a) + (double)_a); return (float)(( (double)rand()/(double)RAND_MAX ) * ((double)_b-(double)_a) + (double)_a);

View File

@ -7,15 +7,15 @@
#include <iostream> #include <iostream>
#include <stdlib.h> #include <cstdlib>
#include <stdio.h> #include <cstdio>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <cstring>
#include <assert.h> #include <cassert>
// defien type : uintXX_t and intXX_t // defien type : uintXX_t and intXX_t
#define __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS
// note in android include the macro of min max are overwitten // note in android include the macro of min max are overwitten
#include <stdint.h> #include <cstdint>
// in case of android error ... // in case of android error ...
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
#if __ANDROID_BOARD_ID__ <= 20 #if __ANDROID_BOARD_ID__ <= 20
@ -39,7 +39,7 @@
#endif #endif
#endif #endif
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
#ifndef ETK_BUILD_LINEARMATH #ifndef ETK_BUILD_LINEARMATH
//! @brief If not using linear math from bullet lib, we need to define the basic element of a btScalar (float) //! @brief If not using linear math from bullet lib, we need to define the basic element of a btScalar (float)
@ -47,7 +47,7 @@
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
#include <math.h> #include <cmath>
#ifndef _MATH_H_MATHDEF #ifndef _MATH_H_MATHDEF
//! @brief Generate a basic type for floating point unit selection (not finished) //! @brief Generate a basic type for floating point unit selection (not finished)
using float_t = float; using float_t = float;