Merge branch 'develop' into cmake

2020-02-13 15:56:55 +01:00
parent 876fb12fe4 ab2efcc5ad
commit 8abf063aae
2 changed files with 5 additions and 1 deletions
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(lms, 3.6.1, test@test)
+AC_INIT(lms, 3.6.2, test@test)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER(src/config/config.h)

@@ -61,6 +61,10 @@ std::optional<T> readAs(const std::string& str)
 	return res;
 }

+template<>
+std::optional<std::string>
+readAs(const std::string& str);
+
 std::string
 replaceInString(const std::string& str, const std::string& from, const std::string& to);