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

Merge branch 'master' into NDK

Browse Source 
Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
This commit is contained in:
Lynix
2015-09-20 23:41:21 +02:00
parent ea3644ef44 f1c8d09a82
commit b16abf0d09
45 changed files with 3702 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Core/String.cpp
View File

@@ -3847,10 +3847,10 @@ NzString NzString::Number(unsigned long long number, nzUInt8 radix)
NzString NzString::Pointer(const void* ptr)
{
const unsigned int size = sizeof(void*)*2 + 2;
const unsigned int capacity = sizeof(void*)*2 + 2;
auto str = std::make_shared<SharedString>(size);
std::sprintf(str->string.get(), "0x%p", ptr);
auto str = std::make_shared<SharedString>(capacity);
str->size = std::sprintf(str->string.get(), "0x%p", ptr);
return NzString(std::move(str));
}

2
src/Nazara/Core/StringStream.cpp
View File

@@ -166,7 +166,7 @@ NzStringStream& NzStringStream::operator<<(const NzString& string)
NzStringStream& NzStringStream::operator<<(const void* ptr)
{
m_strings.push_back(NzString::Pointer(ptr));
m_bufferSize += sizeof(void*)*2;
m_bufferSize += m_strings.back().GetSize();
return *this;
}