From 08df463c949fc1f1d51b51f61f00a5cd0e626e71 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 12 Jul 2016 00:37:08 +0100 Subject: [PATCH] Separate declaration and definition of some static members to hopefully calm Travis down. --- components/files/configurationmanager.cpp | 4 ++++ components/files/configurationmanager.hpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 951c444a5..46775a7fb 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -164,6 +164,10 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path, return false; } +const int escape_hash_filter::sEscape = '@'; +const int escape_hash_filter::sEscapeIdentifier = 'a'; +const int escape_hash_filter::sHashIdentifier = 'h'; + escape_hash_filter::escape_hash_filter() : mNext(), mSeenNonWhitespace(false), mFinishLine(false) { } diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp index 20d5c62ec..6e1cfbdb1 100644 --- a/components/files/configurationmanager.hpp +++ b/components/files/configurationmanager.hpp @@ -71,9 +71,9 @@ struct ConfigurationManager */ struct escape_hash_filter : public boost::iostreams::input_filter { - static const int sEscape = '@'; - static const int sHashIdentifier = 'h'; - static const int sEscapeIdentifier = 'a'; + static const int sEscape; + static const int sHashIdentifier; + static const int sEscapeIdentifier; escape_hash_filter(); virtual ~escape_hash_filter();