sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More VS fixes

Browse Source 
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
This commit is contained in:
Lynix
2015-06-13 19:42:07 +02:00
parent 009d860d6c
commit 251e21f006
35 changed files with 121 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/Nazara/Core/Color.hpp
View File

@@ -11,7 +11,7 @@
#include <Nazara/Core/String.hpp>
#include <Nazara/Math/Vector3.hpp>
class NzColor
class NAZARA_API NzColor
{
public:
NzColor();
@@ -47,15 +47,15 @@ class NzColor
nzUInt8 r, g, b, a;
static NAZARA_API const NzColor Black;
static NAZARA_API const NzColor Blue;
static NAZARA_API const NzColor Cyan;
static NAZARA_API const NzColor Green;
static NAZARA_API const NzColor Magenta;
static NAZARA_API const NzColor Orange;
static NAZARA_API const NzColor Red;
static NAZARA_API const NzColor Yellow;
static NAZARA_API const NzColor White;
static const NzColor Black;
static const NzColor Blue;
static const NzColor Cyan;
static const NzColor Green;
static const NzColor Magenta;
static const NzColor Orange;
static const NzColor Red;
static const NzColor Yellow;
static const NzColor White;
private:
static float Hue2RGB(float v1, float v2, float vH);

14
include/Nazara/Core/SparsePtr.inl
View File

@@ -2,6 +2,7 @@
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <iterator>
#include <Nazara/Core/Debug.hpp>
template<typename T>
@@ -244,4 +245,17 @@ bool NzSparsePtr<T>::operator>=(const NzSparsePtr& ptr) const
return m_ptr >= ptr.m_ptr;
}
namespace std
{
template<typename T>
struct iterator_traits<NzSparsePtr<T>>
{
using difference_type = ptrdiff_t;
using iterator_category = random_access_iterator_tag;
using reference = const T&;
using pointer = const T*;
using value_type = T;
};
}
#include <Nazara/Core/DebugOff.hpp>