From c338b665ed870363d17a52d2e6e6db276934351f Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Tue, 27 Nov 2012 18:40:38 +0000 Subject: [PATCH] - applied patch to fix compilation errors with CLang following issue #3590305 git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1339 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/STEPFile.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/STEPFile.h b/code/STEPFile.h index f958956bc..3c63bd700 100644 --- a/code/STEPFile.h +++ b/code/STEPFile.h @@ -192,19 +192,19 @@ namespace STEP { } // utilities to deal with SELECT entities, which currently lack automatic - // conversion support. - template - const T& ResolveSelect(const DB& db) const { - return Couple(db).MustGetObject(To())->To(); - } - - template - const T* ResolveSelectPtr(const DB& db) const { - const EXPRESS::ENTITY* e = ToPtr(); - return e?Couple(db).MustGetObject(*e)->ToPtr():(const T*)0; - } - - public: + // conversion support. + template + const T& ResolveSelect(const DB& db) const { + return Couple(db).MustGetObject(To())->template To(); + } + + template + const T* ResolveSelectPtr(const DB& db) const { + const EXPRESS::ENTITY* e = ToPtr(); + return e?Couple(db).MustGetObject(*e)->template ToPtr():(const T*)0; + } + + public: /** parse a variable from a string and set 'inout' to the character * behind the last consumed character. An optional schema enables,