From c804042978a95d44096878dd07897f6b1cc41c15 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed, 2 Jul 2014 10:36:19 -0700
Subject: [PATCH] Fix test compilation with gcc

---
 tests/Makefile        |  2 +-
 tests/tests/cajun.cpp | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 8c1818c57..69b7fbb89 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,7 +7,7 @@ run_PCH := $(d)support/tests_pre.h
 run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \
 	-I$(GTEST_ROOT) -I$(GTEST_ROOT)/include $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
 run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare
-run_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
+run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) -pthread
 run_OBJ := \
 	$(subst .cpp,.o,$(wildcard $(d)tests/*.cpp)) \
 	$(d)support/main.o \
diff --git a/tests/tests/cajun.cpp b/tests/tests/cajun.cpp
index ef054c76e..e46aae365 100644
--- a/tests/tests/cajun.cpp
+++ b/tests/tests/cajun.cpp
@@ -28,12 +28,12 @@
 class lagi_cajun : public libagi { };
 
 TEST(lagi_cajun, CastNonConst) {
-	json::UnknownElement Integer = 0;
-	json::UnknownElement Double = 0.0;
-	json::UnknownElement String = "1";
-	json::UnknownElement Boolean = false;
-	json::UnknownElement Array = json::Array();
-	json::UnknownElement Object = json::Object();
+	auto Integer = json::UnknownElement{0};
+	auto Double  = json::UnknownElement{0.0};
+	auto String  = json::UnknownElement{"1"};
+	auto Boolean = json::UnknownElement{false};
+	auto Array   = json::UnknownElement{json::Array{}};
+	auto Object  = json::UnknownElement{json::Object{}};
 
 	EXPECT_NO_THROW(static_cast<json::Integer&>(Integer));
 	EXPECT_NO_THROW(static_cast<json::Double&>(Double));
@@ -51,12 +51,12 @@ TEST(lagi_cajun, CastNonConst) {
 }
 
 TEST(lagi_cajun, CastConst) {
-	const json::UnknownElement Integer = 10;
-	const json::UnknownElement Double = 10.0;
-	const json::UnknownElement String = "1";
-	const json::UnknownElement Boolean = false;
-	const json::UnknownElement Array = json::Array();
-	const json::UnknownElement Object = json::Object();
+	const auto Integer = json::UnknownElement{10};
+	const auto Double  = json::UnknownElement{10.0};
+	const auto String  = json::UnknownElement{"1"};
+	const auto Boolean = json::UnknownElement{false};
+	const auto Array   = json::UnknownElement{json::Array{}};
+	const auto Object  = json::UnknownElement{json::Object{}};
 
 	/* these shouldn't compile
 	EXPECT_NO_THROW(static_cast<json::Integer&>(Integer));