From bd75a3b830b4707a1162c9b39dad45479eda8c55 Mon Sep 17 00:00:00 2001 From: "J. de Vries" Date: Tue, 24 May 2016 13:31:26 +0200 Subject: [PATCH] Issue #32: Removed C++ variable list initialization due to compiler conflicts. --- includes/learnopengl/filesystem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/learnopengl/filesystem.h b/includes/learnopengl/filesystem.h index 80f1e88..5dc189c 100644 --- a/includes/learnopengl/filesystem.h +++ b/includes/learnopengl/filesystem.h @@ -20,8 +20,8 @@ private: static std::string const & getRoot() { static char const * envRoot = getenv("LOGL_ROOT_PATH"); - static char const * givenRoot {envRoot != nullptr ? envRoot : logl_root}; - static std::string root {givenRoot != nullptr ? givenRoot : ""}; + static char const * givenRoot = (envRoot != nullptr ? envRoot : logl_root); + static std::string root = (givenRoot != nullptr ? givenRoot : ""); return root; }