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

Update copy/move constructors/operators

Browse Source 
Former-commit-id: b1faeeae9211a6c0ca29261d46929dc8c66ea0c4
This commit is contained in:
Lynix
2015-09-24 12:51:52 +02:00
parent dea3fb4e39
commit c214251ecf
24 changed files with 89 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Core/Clock.hpp
View File

@@ -20,6 +20,8 @@ class NAZARA_CORE_API NzClock
public:
NzClock(nzUInt64 startingValue = 0, bool paused = false);
NzClock(const NzClock& clock) = default;
NzClock(NzClock&& clock) = default;
~NzClock() = default;
float GetSeconds() const;
nzUInt64 GetMicroseconds() const;
@@ -32,6 +34,7 @@ class NAZARA_CORE_API NzClock
void Unpause();
NzClock& operator=(const NzClock& clock) = default;
NzClock& operator=(NzClock&& clock) = default;
private:
NazaraMutexAttrib(m_mutex, mutable)

3
include/Nazara/Core/HardwareInfo.hpp
View File

@@ -14,6 +14,9 @@
class NAZARA_CORE_API NzHardwareInfo
{
public:
NzHardwareInfo() = delete;
~NzHardwareInfo() = delete;
static void Cpuid(nzUInt32 functionId, nzUInt32 subFunctionId, nzUInt32 result[4]);
static NzString GetProcessorBrandString();

5
include/Nazara/Core/Hashable.hpp
View File

@@ -19,11 +19,16 @@ class NAZARA_CORE_API NzHashable
public:
NzHashable() = default;
NzHashable(const NzHashable&) = default;
NzHashable(NzHashable&&) = default;
virtual ~NzHashable();
NzHashDigest GetHash(nzHash hash) const;
NzHashDigest GetHash(NzAbstractHash* impl) const;
NzHashable& operator=(const NzHashable&) = default;
NzHashable& operator=(NzHashable&&) = default;
private:
virtual bool FillHash(NzAbstractHash* impl) const = 0;
};

5
include/Nazara/Core/Initializer.hpp
View File

@@ -14,6 +14,8 @@ class NzInitializer
{
public:
NzInitializer(bool initialize = true);
NzInitializer(const NzInitializer&) = delete;
NzInitializer(NzInitializer&&) = delete; ///TODO
~NzInitializer();
bool Initialize();
@@ -22,6 +24,9 @@ class NzInitializer
operator bool() const;
NzInitializer& operator=(const NzInitializer&) = delete;
NzInitializer& operator=(NzInitializer&&) = delete; ///TODO
private:
bool m_initialized;
};

5
include/Nazara/Core/MemoryStream.hpp
View File

@@ -14,6 +14,8 @@ class NAZARA_CORE_API NzMemoryStream : public NzInputStream
{
public:
NzMemoryStream(const void* ptr, nzUInt64 size);
NzMemoryStream(const NzMemoryStream&) = delete;
NzMemoryStream(NzMemoryStream&&) = delete; ///TODO
~NzMemoryStream();
bool EndOfStream() const;
@@ -25,6 +27,9 @@ class NAZARA_CORE_API NzMemoryStream : public NzInputStream
bool SetCursorPos(nzUInt64 offset);
NzMemoryStream& operator=(const NzMemoryStream&) = delete;
NzMemoryStream& operator=(NzMemoryStream&&) = delete; ///TODO
private:
const nzUInt8* m_ptr;
nzUInt64 m_pos;

4
include/Nazara/Core/ParameterList.hpp
View File

@@ -19,7 +19,7 @@ class NAZARA_CORE_API NzParameterList
NzParameterList() = default;
NzParameterList(const NzParameterList& list);
NzParameterList(NzParameterList&& list);
NzParameterList(NzParameterList&&) = default;
~NzParameterList();
void Clear();
@@ -46,7 +46,7 @@ class NAZARA_CORE_API NzParameterList
void SetParameter(const NzString& name, int value);
NzParameterList& operator=(const NzParameterList& list);
NzParameterList& operator=(NzParameterList&& list);
NzParameterList& operator=(NzParameterList&&) = default;
private:
struct Parameter

5
include/Nazara/Core/PrimitiveList.hpp
View File

@@ -15,6 +15,8 @@ class NAZARA_CORE_API NzPrimitiveList
{
public:
NzPrimitiveList() = default;
NzPrimitiveList(const NzPrimitiveList&) = default;
NzPrimitiveList(NzPrimitiveList&&) = default;
~NzPrimitiveList() = default;
void AddBox(const NzVector3f& lengths, const NzVector3ui& subdivision = NzVector3ui(0U), const NzMatrix4f& transformMatrix = NzMatrix4f::Identity());
@@ -35,6 +37,9 @@ class NAZARA_CORE_API NzPrimitiveList
const NzPrimitive& GetPrimitive(unsigned int i) const;
unsigned int GetSize() const;
NzPrimitiveList& operator=(const NzPrimitiveList&) = default;
NzPrimitiveList& operator=(NzPrimitiveList&&) = default;
NzPrimitive& operator()(unsigned int i);
const NzPrimitive& operator()(unsigned int i) const;

4
include/Nazara/Core/SparsePtr.hpp
View File

@@ -45,6 +45,8 @@ class NzSparsePtr
T* operator->() const;
T& operator[](int index) const;
NzSparsePtr& operator=(const NzSparsePtr& ptr) = default;
NzSparsePtr operator+(int count) const;
NzSparsePtr operator+(unsigned int count) const;
NzSparsePtr operator-(int count) const;
@@ -67,8 +69,6 @@ class NzSparsePtr
bool operator<=(const NzSparsePtr& ptr) const;
bool operator>=(const NzSparsePtr& ptr) const;
NzSparsePtr& operator=(const NzSparsePtr& ptr) = default;
private:
BytePtr m_ptr;
int m_stride;

5
include/Nazara/Core/Stream.hpp
View File

@@ -15,6 +15,8 @@ class NAZARA_CORE_API NzStream
{
public:
NzStream() = default;
NzStream(const NzStream&) = default;
NzStream(NzStream&&) = default;
virtual ~NzStream();
virtual nzUInt64 GetCursorPos() const = 0;
@@ -25,6 +27,9 @@ class NAZARA_CORE_API NzStream
virtual bool SetCursorPos(nzUInt64 offset) = 0;
void SetStreamOptions(unsigned int options);
NzStream& operator=(const NzStream&) = default;
NzStream& operator=(NzStream&&) = default;
protected:
unsigned int m_streamOptions = 0;
};

5
include/Nazara/Core/StringStream.hpp
View File

@@ -17,9 +17,14 @@ class NAZARA_CORE_API NzStringStream
public:
NzStringStream();
NzStringStream(const NzString& str);
NzStringStream(const NzStringStream&) = default;
NzStringStream(NzStringStream&&) noexcept = default;
NzString ToString() const;
NzStringStream& operator=(const NzStringStream&) = default;
NzStringStream& operator=(NzStringStream&&) noexcept = default;
NzStringStream& operator<<(bool boolean);
NzStringStream& operator<<(short number);
NzStringStream& operator<<(unsigned short number);

2
include/Nazara/Core/Thread.hpp
View File

@@ -23,7 +23,7 @@ class NAZARA_CORE_API NzThread
template<typename F, typename... Args> NzThread(F function, Args&&... args);
template<typename C> NzThread(void (C::*function)(), C* object);
NzThread(const NzThread&) = delete;
NzThread(NzThread&& other);
NzThread(NzThread&& other) noexcept;
~NzThread();
void Detach();