Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Compilation with GCC 6

Browse source
This commit is contained in:
kervala 2016-12-03 18:14:31 +01:00
parent bb9cec5372
commit 387ec5db8b
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/include/nel/3d/gpu_program_params.h
View file

@ -27,7 +27,8 @@
#ifndef NL3D_GPU_PROGRAM_PARAMS_H #ifndef NL3D_GPU_PROGRAM_PARAMS_H
#define NL3D_GPU_PROGRAM_PARAMS_H #define NL3D_GPU_PROGRAM_PARAMS_H
#include <nel/misc/types_nl.h>
#include "nel/misc/types_nl.h"
// STL includes // STL includes
#include <map> #include <map>
@ -167,7 +168,7 @@ private:
std::map<std::string, size_t> m_MapName; // map from name to offset std::map<std::string, size_t> m_MapName; // map from name to offset
size_t m_First; size_t m_First;
size_t m_Last; size_t m_Last;
static const size_t s_End = -1; static const size_t s_End;
}; /* class CGPUProgramParams */ }; /* class CGPUProgramParams */

5
code/nel/src/3d/gpu_program_params.cpp
View file

@ -26,7 +26,6 @@
*/ */
#include "std3d.h" #include "std3d.h"
#include "nel/misc/types_nl.h"
#include "nel/3d/gpu_program_params.h" #include "nel/3d/gpu_program_params.h"
// STL includes // STL includes
@ -44,14 +43,14 @@ using namespace std;
namespace NL3D { namespace NL3D {
const size_t CGPUProgramParams::s_End = -1;
CGPUProgramParams::CGPUProgramParams() : m_First(s_End), m_Last(s_End) CGPUProgramParams::CGPUProgramParams() : m_First(s_End), m_Last(s_End)
{ {
} }
CGPUProgramParams::~CGPUProgramParams() CGPUProgramParams::~CGPUProgramParams()
{ {
} }
void CGPUProgramParams::copy(CGPUProgramParams *params) void CGPUProgramParams::copy(CGPUProgramParams *params)