mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed clang build.

Browse Source
This commit is contained in:
Branimir Karadzic 2014-10-17 09:45:45 -07:00
parent e4623aa81c
commit 46ec4e390c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/common/bgfx_utils.cpp
View File

@ -3,8 +3,12 @@
* License: http://www.opensource.org/licenses/BSD-2-Clause * License: http://www.opensource.org/licenses/BSD-2-Clause
*/ */
#include <vector> #include <string.h> // strlen
#include <string>
#include <tinystl/allocator.h>
#include <tinystl/vector.h>
#include <tinystl/string.h>
namespace stl = tinystl;
#include <bgfx.h> #include <bgfx.h>
#include <bx/readerwriter.h> #include <bx/readerwriter.h>
@ -240,7 +244,7 @@ struct Primitive
Obb m_obb; Obb m_obb;
}; };
typedef std::vector<Primitive> PrimitiveArray; typedef stl::vector<Primitive> PrimitiveArray;
struct Group struct Group
{ {
@ -321,7 +325,7 @@ struct Mesh
uint16_t len; uint16_t len;
read(_reader, len); read(_reader, len);
std::string material; stl::string material;
material.resize(len); material.resize(len);
read(_reader, const_cast<char*>(material.c_str() ), len); read(_reader, const_cast<char*>(material.c_str() ), len);
@ -332,7 +336,7 @@ struct Mesh
{ {
read(_reader, len); read(_reader, len);
std::string name; stl::string name;
name.resize(len); name.resize(len);
read(_reader, const_cast<char*>(name.c_str() ), len); read(_reader, const_cast<char*>(name.c_str() ), len);
@ -404,7 +408,7 @@ struct Mesh
} }
bgfx::VertexDecl m_decl; bgfx::VertexDecl m_decl;
typedef std::vector<Group> GroupArray; typedef stl::vector<Group> GroupArray;
GroupArray m_groups; GroupArray m_groups;
}; };

1
examples/common/entry/input.cpp
View File

@ -4,7 +4,6 @@
*/ */
#include <memory.h> #include <memory.h>
#include <string>
#include "entry_p.h" #include "entry_p.h"
#include "input.h" #include "input.h"