From e59ad870448613a92664b1b76d57bf9fede22fde Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 1 Nov 2017 14:16:54 +0000 Subject: [PATCH] Made template function inline to avoid multiple declaration issues --- include/osg/EnvVar | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/osg/EnvVar b/include/osg/EnvVar index 5a8cb043a..71c1f172f 100644 --- a/include/osg/EnvVar +++ b/include/osg/EnvVar @@ -23,7 +23,7 @@ namespace osg { template -bool getEnvVar(const char* name, T& value) +inline bool getEnvVar(const char* name, T& value) { #ifdef OSG_ENVVAR_SUPPORTED const char* ptr = getenv(name); @@ -38,7 +38,7 @@ bool getEnvVar(const char* name, T& value) } template<> -bool getEnvVar(const char* name, std::string& value) +inline bool getEnvVar(const char* name, std::string& value) { #ifdef OSG_ENVVAR_SUPPORTED const char* ptr = getenv(name); @@ -52,7 +52,7 @@ bool getEnvVar(const char* name, std::string& value) } template -bool getEnvVar(const char* name, T1& value1, T2& value2) +inline bool getEnvVar(const char* name, T1& value1, T2& value2) { #ifdef OSG_ENVVAR_SUPPORTED const char* ptr = getenv(name); @@ -67,7 +67,7 @@ bool getEnvVar(const char* name, T1& value1, T2& value2) } template -bool getEnvVar(const char* name, T1& value1, T2& value2, T3& value3) +inline bool getEnvVar(const char* name, T1& value1, T2& value2, T3& value3) { #ifdef OSG_ENVVAR_SUPPORTED const char* ptr = getenv(name); @@ -82,7 +82,7 @@ bool getEnvVar(const char* name, T1& value1, T2& value2, T3& value3) } template -bool getEnvVar(const char* name, T1& value1, T2& value2, T3& value3, T4& value4) +inline bool getEnvVar(const char* name, T1& value1, T2& value2, T3& value3, T4& value4) { #ifdef OSG_ENVVAR_SUPPORTED const char* ptr = getenv(name);