atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correction of sime include and commant

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etk/Color.h
View File

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

4
etk/Hash.h
View File

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

3
etk/Noise.h
View File

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

5
etk/RegExp.h
View File

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

3
etk/archive/Archive.h
View File

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

3
etk/debug.h
View File

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

3
etk/debugGeneric.h
View File

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

9
etk/math/Matrix4.h
View File

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

2
etk/math/Plane.h
View File

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

3
etk/math/Vector2D.h
View File

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

3
etk/math/Vector3D.h
View File

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

3
etk/math/Vector4D.h
View File

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

3
etk/os/FSNode.h
View File

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

10
etk/os/FSNodeRight.h
View File

@ -6,15 +6,13 @@
* @license BSD v3 (see license file) * @license BSD v3 (see license file)
*/ */
#include <etk/types.h>
#ifndef __ETK_FILE_SYSTEM_NODE_RIGHT_H__ #ifndef __ETK_FILE_SYSTEM_NODE_RIGHT_H__
#define __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: private:
uint16_t m_rights; uint16_t m_rights;
public: public:

4
etk/os/Fifo.h
View File

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

4
etk/tool.h
View File

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

1
test/main.cpp
View File

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