From 46ec4e390c2db4682ed7a91257e09a71b77f7582 Mon Sep 17 00:00:00 2001 From: Branimir Karadzic Date: Fri, 17 Oct 2014 09:45:45 -0700 Subject: [PATCH] Fixed clang build. --- examples/common/bgfx_utils.cpp | 16 ++++++++++------ examples/common/entry/input.cpp | 1 - 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/examples/common/bgfx_utils.cpp b/examples/common/bgfx_utils.cpp index 75572b6b..c6e39d4b 100644 --- a/examples/common/bgfx_utils.cpp +++ b/examples/common/bgfx_utils.cpp @@ -3,8 +3,12 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include -#include +#include // strlen + +#include +#include +#include +namespace stl = tinystl; #include #include @@ -240,7 +244,7 @@ struct Primitive Obb m_obb; }; -typedef std::vector PrimitiveArray; +typedef stl::vector PrimitiveArray; struct Group { @@ -321,7 +325,7 @@ struct Mesh uint16_t len; read(_reader, len); - std::string material; + stl::string material; material.resize(len); read(_reader, const_cast(material.c_str() ), len); @@ -332,7 +336,7 @@ struct Mesh { read(_reader, len); - std::string name; + stl::string name; name.resize(len); read(_reader, const_cast(name.c_str() ), len); @@ -404,7 +408,7 @@ struct Mesh } bgfx::VertexDecl m_decl; - typedef std::vector GroupArray; + typedef stl::vector GroupArray; GroupArray m_groups; }; diff --git a/examples/common/entry/input.cpp b/examples/common/entry/input.cpp index c817e02d..110e3cde 100644 --- a/examples/common/entry/input.cpp +++ b/examples/common/entry/input.cpp @@ -4,7 +4,6 @@ */ #include -#include #include "entry_p.h" #include "input.h"