From 0efb8e29493b4f26bd591e5a359414a1c1088395 Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Thu, 24 Dec 2015 17:18:32 +0100 Subject: [PATCH] osgDB::ObjectCache was added in 3.3.3, not 3.4.0 Fixes redefinition error on builds with OSG >3.3.3 <3.4.0 --- components/resource/objectcache.cpp | 2 +- components/resource/objectcache.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp index 8c2c52416..7264d05aa 100644 --- a/components/resource/objectcache.cpp +++ b/components/resource/objectcache.cpp @@ -13,7 +13,7 @@ #include -#if OSG_VERSION_LESS_THAN(3,4,0) +#if OSG_VERSION_LESS_THAN(3,3,3) #include "objectcache.hpp" diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp index 0a342f27f..cae48ca6b 100644 --- a/components/resource/objectcache.hpp +++ b/components/resource/objectcache.hpp @@ -19,7 +19,7 @@ #include -#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0) +#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3) #include #else