[DEBUG] correction of sime include and commant

This commit is contained in:
Edouard DUPIN 2013-12-28 14:19:38 +01:00
parent 1c30df018d
commit df148eca23
17 changed files with 40 additions and 27 deletions

View File

@ -6,11 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_COLOR_H__
#define __ETK_COLOR_H__
#include <etk/types.h>
namespace etk {
/**
* @brief The color class is a template to abstract the color implementation choice.

View File

@ -6,11 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_HACH_H__
#define __ETK_HACH_H__
#include <etk/types.h>
#undef __class__
#define __class__ "etk::Hash"

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_NOISE_H__
#define __ETK_NOISE_H__
#include <etk/types.h>
#include <etk/math/Vector2D.h>
namespace etk {

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __TK_REG_EXP_H__
#define __TK_REG_EXP_H__
#include <etk/types.h>
#include <etk/debug.h>
#include <etk/stdTools.h>
#include <vector>
@ -1415,7 +1416,7 @@ template<class CLASS_TYPE> class RegExp {
* @return the string representing the RegExp
*/
std::string getRegExp(void) const {
return to_u8string(m_expressionRequested);
return std::to_string(m_expressionRequested);
};
/**
* @previous

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_ARCHIVE_H__
#define __ETK_ARCHIVE_H__
#include <etk/types.h>
#include <etk/Hash.h>
namespace etk {

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_DEBUG_H__
#define __ETK_DEBUG_H__
#include <etk/types.h>
#include <etk/debugGeneric.h>
extern const char * etkLibName;

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_DEBUG_GENERIC_H__
#define __ETK_DEBUG_GENERIC_H__
#include <etk/types.h>
#include <etk/Stream.h>
namespace debug {

View File

@ -6,20 +6,19 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_TYPES_MATRIX4_H__
#define __ETK_TYPES_MATRIX4_H__
#include <etk/types.h>
#include <math.h>
#include <etk/math/Vector3D.h>
#define DEG_TO_RAD(a) ((a)*M_PI/180.0f)
#define RAD_TO_DEG(a) ((a)*180.0f/M_PI)
namespace etk
{
class Matrix4
{
namespace etk {
class Matrix4 {
public:
float m_mat[4*4];
void identity(void) {

View File

@ -6,6 +6,8 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_TYPES_PLANE_H__
#define __ETK_TYPES_PLANE_H__

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_MATH_VECTOR2D_H__
#define __ETK_MATH_VECTOR2D_H__
#include <etk/types.h>
#include <etk/Stream.h>
#include <etk/math/Vector3D.h>
#include <math.h>

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_MATH_VECTOR3D_H__
#define __ETK_MATH_VECTOR3D_H__
#include <etk/types.h>
#include <etk/debug.h>
#include <math.h>
#include <etk/Stream.h>

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_MATH_VECTOR4D_H__
#define __ETK_MATH_VECTOR4D_H__
#include <etk/types.h>
#include <etk/debug.h>
#include <math.h>
#include <etk/Stream.h>

View File

@ -6,10 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_FILE_SYSTEM_NODE_H__
#define __ETK_FILE_SYSTEM_NODE_H__
#include <etk/types.h>
#include <etk/os/FSNodeRight.h>
#ifdef __TARGET_OS__Android

View File

@ -6,15 +6,13 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_FILE_SYSTEM_NODE_RIGHT_H__
#define __ETK_FILE_SYSTEM_NODE_RIGHT_H__
#include <etk/types.h>
namespace etk
{
class FSNodeRight
{
namespace etk {
class FSNodeRight {
private:
uint16_t m_rights;
public:

View File

@ -6,6 +6,8 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_MESSAGE_FIFO_H__
#define __ETK_MESSAGE_FIFO_H__
@ -33,6 +35,7 @@ namespace etk {
};
/**
* @brief Remove the fifo and all message inside.
*/
~Fifo(void) {
// nothing to do ...
};
@ -94,6 +97,7 @@ namespace etk {
/**
* @brief Get the number of message in the fifo.
* @return Number of message in the fifo.
*/
int32_t count(void) {
m_mutex.lock();
int32_t nbElement = m_data.size();

View File

@ -6,11 +6,11 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#ifndef __ETK_TOOL_H__
#define __ETK_TOOL_H__
#include <etk/types.h>
namespace etk {
namespace tool {
float frand(float _a, float _b);

View File

@ -6,6 +6,7 @@
* @license BSD v3 (see license file)
*/
#include <etk/types.h>
#include <etk/debug.h>
#include <vector>
#include <string>