From 949a27a7438587ee873442b840a1908d9e0a8af4 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 22 Oct 2016 23:34:56 +0200 Subject: [PATCH] New streaming interface: fix build. --- code/IOStreamBuffer.h | 2 +- code/ObjFileParser.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/IOStreamBuffer.h b/code/IOStreamBuffer.h index 5b00ef5d6..aeb600328 100644 --- a/code/IOStreamBuffer.h +++ b/code/IOStreamBuffer.h @@ -69,7 +69,7 @@ private: template inline -IOStreamBuffer::IOStreamBuffer( size_t cache = 4096 * 4096 ) +IOStreamBuffer::IOStreamBuffer( size_t cache ) : m_stream( nullptr ) , m_filesize( 0 ) , m_cacheSize( cache ) diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp index a46d7c084..2469219f8 100644 --- a/code/ObjFileParser.cpp +++ b/code/ObjFileParser.cpp @@ -38,8 +38,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ - - #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER #include "ObjFileParser.h" @@ -54,14 +52,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include - namespace Assimp { const std::string ObjFileParser::DEFAULT_MATERIAL = AI_DEFAULT_MATERIAL_NAME; // ------------------------------------------------------------------- // Constructor with loaded data and directories. -ObjFileParser::ObjFileParser( IOStreamBuffer &streamBuffer, const std::string &modelName, IOSystem *io, ProgressHandler* progress, const std::string &originalObjFileName) : +ObjFileParser::ObjFileParser( IOStreamBuffer &streamBuffer, const std::string &modelName, + IOSystem *io, ProgressHandler* progress, + const std::string &originalObjFileName) : m_DataIt(), m_DataItEnd(), m_pModel(NULL),