From 371f60210006a440a97d8ac1e3c6b7bdeacd7353 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 31 Mar 2014 10:16:59 -0700
Subject: [PATCH] Fix tests compilation

---
 libaegisub/include/libaegisub/hotkey.h | 4 ++++
 libaegisub/include/libaegisub/mru.h    | 4 ++++
 libaegisub/include/libaegisub/option.h | 4 ++++
 tests/tests/mru.cpp                    | 4 ++--
 tests/tests/option.cpp                 | 8 ++++----
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/libaegisub/include/libaegisub/hotkey.h b/libaegisub/include/libaegisub/hotkey.h
index c4ddb48f3..a520d6e6c 100644
--- a/libaegisub/include/libaegisub/hotkey.h
+++ b/libaegisub/include/libaegisub/hotkey.h
@@ -101,6 +101,10 @@ public:
 	/// @param default_config Default config.
 	Hotkey(agi::fs::path const& file, std::pair<const char *, size_t> default_config);
 
+	template<size_t N>
+	Hotkey(agi::fs::path const& file, const char (&default_config)[N])
+	: Hotkey(file, std::make_pair(default_config, N - 1)) { }
+
 	/// Scan for a matching key.
 	/// @param context  Context requested.
 	/// @param str      Hyphen separated key sequence.
diff --git a/libaegisub/include/libaegisub/mru.h b/libaegisub/include/libaegisub/mru.h
index b4c757f51..34b80824c 100644
--- a/libaegisub/include/libaegisub/mru.h
+++ b/libaegisub/include/libaegisub/mru.h
@@ -56,6 +56,10 @@ public:
 	/// @param config File to load MRU values from
 	MRUManager(agi::fs::path const& config, std::pair<const char *, size_t> default_config, agi::Options *options = nullptr);
 
+	template<size_t N>
+	MRUManager(agi::fs::path const& file, const char (&default_config)[N])
+	: MRUManager(file, std::make_pair(default_config, N - 1)) { }
+
 	/// Destructor
 	~MRUManager();
 
diff --git a/libaegisub/include/libaegisub/option.h b/libaegisub/include/libaegisub/option.h
index 733de5d09..08c82ceff 100644
--- a/libaegisub/include/libaegisub/option.h
+++ b/libaegisub/include/libaegisub/option.h
@@ -76,6 +76,10 @@ public:
 	/// @param default_config Default configuration.
 	Options(agi::fs::path const& file, std::pair<const char *, size_t> default_config, const OptionSetting setting = NONE);
 
+	template<size_t N>
+	Options(agi::fs::path const& file, const char (&default_config)[N], const OptionSetting setting = NONE)
+	: Options(file, std::make_pair(default_config, N - 1), setting) { }
+
 	/// Destructor
 	~Options();
 
diff --git a/tests/tests/mru.cpp b/tests/tests/mru.cpp
index 86648b4db..d727e35b3 100644
--- a/tests/tests/mru.cpp
+++ b/tests/tests/mru.cpp
@@ -17,13 +17,13 @@
 
 #include "main.h"
 
+static const char default_mru[] = "{\"Valid\" : []}";
+
 class lagi_mru : public libagi {
 protected:
-	std::string default_mru;
 	std::string conf_ok;
 
 	void SetUp() override {
-		default_mru = "{\"Valid\" : []}";
 		conf_ok = "./data/mru_ok.json";
 	}
 };
diff --git a/tests/tests/option.cpp b/tests/tests/option.cpp
index 22f777457..237227757 100644
--- a/tests/tests/option.cpp
+++ b/tests/tests/option.cpp
@@ -21,13 +21,13 @@
 
 #include <fstream>
 
+static const char default_opt[] = "{\"Valid\" : \"This is valid\"}";
+
 class lagi_option : public libagi {
 protected:
-	std::string default_opt;
 	std::string conf_ok;
 
 	void SetUp() override {
-		default_opt = "{\"Valid\" : \"This is valid\"}";
 		conf_ok = "data/options/string.json";
 	}
 };
@@ -107,7 +107,7 @@ TEST_F(lagi_option, bad_default_throws_and_null_is_rejected) {
 }
 
 TEST_F(lagi_option, nested_options) {
-	const char *conf = "{ \"a\" : { \"b\" : { \"c\" : { \"c\" : \"value\" } } } }";
+	const char conf[] = "{ \"a\" : { \"b\" : { \"c\" : { \"c\" : \"value\" } } } }";
 	ASSERT_NO_THROW(agi::Options("", conf, agi::Options::FLUSH_SKIP));
 	agi::Options opt("", conf, agi::Options::FLUSH_SKIP);
 	ASSERT_NO_THROW(opt.Get("a/b/c/c"));
@@ -169,7 +169,7 @@ TEST_F(lagi_option, flush_roundtrip) {
 }
 
 TEST_F(lagi_option, mixed_valid_and_invalid_in_user_conf_loads_all_valid) {
-	const char *def = "{\"1\" : false, \"2\" : 1, \"3\" : false }";
+	const char def[] = "{\"1\" : false, \"2\" : 1, \"3\" : false }";
 	agi::Options opt("data/options/all_bool.json", def, agi::Options::FLUSH_SKIP);
 	ASSERT_NO_THROW(opt.ConfigUser());
 	EXPECT_EQ(true, opt.Get("1")->GetBool());