From 30d83d40c168d7ee7d08f3a3f66f623be6b9e0a2 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 7 Aug 2020 19:15:28 +0200 Subject: [PATCH] fix brackets for template in template --- include/assimp/BaseImporter.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/assimp/BaseImporter.h b/include/assimp/BaseImporter.h index e6ff2e68d..06c337853 100644 --- a/include/assimp/BaseImporter.h +++ b/include/assimp/BaseImporter.h @@ -4,7 +4,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2020, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -40,7 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -/** @file Definition of the base class for all importer worker classes. */ +/// @file Definition of the base class for all importer worker classes. + #pragma once #ifndef INCLUDED_AI_BASEIMPORTER_H #define INCLUDED_AI_BASEIMPORTER_H @@ -87,10 +87,6 @@ class IOStream; class ASSIMP_API BaseImporter { friend class Importer; -private: - /* Pushes state into importer for the importer scale */ - virtual void UpdateImporterScale(Importer *pImp); - public: /** Constructor to be privately used by #Importer */ BaseImporter() AI_NO_EXCEPT; @@ -399,7 +395,7 @@ public: // static utilities * @param numOut The output count of elements copied. */ template AI_FORCE_INLINE static void CopyVector( - std::vector> &vec, + std::vector > &vec, T **&out, unsigned int &outLength) { outLength = unsigned(vec.size()); @@ -410,7 +406,11 @@ public: // static utilities } } -protected: +private: + /* Pushes state into importer for the importer scale */ + virtual void UpdateImporterScale(Importer *pImp); + + protected: /// Error description in case there was one. std::string m_ErrorText; /// Currently set progress handler.