mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to Ghoul change (use ghoul::to_string instead of std::to_string)

Browse Source
This commit is contained in:
Alexander Bock
2018-07-20 13:56:15 -04:00
parent edc75c562c
commit 74fd38c260
17 changed files with 100 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/util/keys.h
+11 -5
View File
@@ -57,6 +57,7 @@
// All values that are defined here are compatible with (and are based on) the
// definitions GLFW v3.1
#include <ghoul/misc/stringconversion.h>
#include <map>
#include <string>
@@ -361,12 +362,17 @@ static const std::map<std::string, Key> KeyMapping = {
} // namespace openspace
namespace std {
namespace ghoul {
std::string to_string(openspace::Key key);
std::string to_string(openspace::KeyModifier mod);
std::string to_string(openspace::KeyWithModifier key);
template <>
std::string to_string(const openspace::Key& key);
} // namespace std
template <>
std::string to_string(const openspace::KeyModifier& mod);
template <>
std::string to_string(const openspace::KeyWithModifier& key);
} // namespace ghoul
#endif // __OPENSPACE_CORE___KEYS___H__