Merge pull request #1253 from danilaml/patch-1

Fix clang compiling
2015-10-14 00:19:47 +03:00
parent d8d09b5472 74daf9145a
commit 6d99516489
2 changed files with 3 additions and 2 deletions
@@ -94,7 +94,7 @@ public:
 			value(convert::to<T>(new_value));
 		}

-		void value_from(const entry_base* rhs)
+		void value_from(const entry_base* rhs) override
 		{
 			value(static_cast<const entry*>(rhs)->value());
 		}
@@ -125,4 +125,4 @@ public:
 	void set_defaults();

 	std::string to_string() const;
-};
+};
@@ -19,6 +19,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	# Warnings
 	add_compile_options(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof)
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+	add_compile_options(-ftemplate-depth=1024)
 	if(APPLE)
 		add_compile_options(-stdlib=libc++)
 	endif()