From e16eb147a180430bad4f3f6d310e92a0812fe303 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 30 Apr 2014 11:51:40 +0000 Subject: [PATCH] From Sebastian Messerschmidt, "attached is the compile/linker fix for multiple definitions of getTypeEnum when compiling the Lua with VisualStudio and potentially other compilers. " --- include/osgDB/PropertyInterface | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgDB/PropertyInterface b/include/osgDB/PropertyInterface index 581819910..b8d31d753 100644 --- a/include/osgDB/PropertyInterface +++ b/include/osgDB/PropertyInterface @@ -55,8 +55,8 @@ extern OSGDB_EXPORT const char* getTypeStringFromPtr(const osg::Image*); #define DECLARE_TYPE(A,B) \ - template<> osgDB::BaseSerializer::Type getTypeEnum() { return osgDB::BaseSerializer::RW_##B; } \ - template<> const char* getTypeString() { return #B; } + template<> inline osgDB::BaseSerializer::Type getTypeEnum() { return osgDB::BaseSerializer::RW_##B; } \ + template<> inline const char* getTypeString() { return #B; } DECLARE_TYPE(osg::Image*, IMAGE) DECLARE_TYPE(osg::Object*, OBJECT)