From 4954dda5618273dcfe7e65cb745f09937ae0e604 Mon Sep 17 00:00:00 2001 From: wundahlful Date: Thu, 23 Jun 2016 15:32:10 -0600 Subject: [PATCH 1/2] Updating deprecated cppformat/format.h to fmt/format.h The warning in cppformat's version throws a fatal error in the VS compiler --- modules/onscreengui/src/guiperformancecomponent.cpp | 2 +- src/util/spicemanager.cpp | 2 +- src/util/time_lua.inl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/onscreengui/src/guiperformancecomponent.cpp b/modules/onscreengui/src/guiperformancecomponent.cpp index 0bd4511ab3..9f161dc68d 100644 --- a/modules/onscreengui/src/guiperformancecomponent.cpp +++ b/modules/onscreengui/src/guiperformancecomponent.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index 7c6ecb08d6..919ee21557 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include namespace { const std::string _loggerCat = "SpiceManager"; diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl index 687780c459..89681cf9fc 100644 --- a/src/util/time_lua.inl +++ b/src/util/time_lua.inl @@ -24,7 +24,7 @@ #include -#include +#include #include namespace openspace { From b32262390ce0895a4bd3c4c94391f214f7f0a753 Mon Sep 17 00:00:00 2001 From: wundahlful Date: Thu, 23 Jun 2016 16:00:26 -0600 Subject: [PATCH 2/2] Updated Ghoul version for cppformat changes --- ext/ghoul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ghoul b/ext/ghoul index 9b822d0133..f519946a02 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 9b822d01339fcc216fb35582977b91ac85ff099a +Subproject commit f519946a026e8bf538d8caa5d258fe5b623366d9