Merge branch 'develop' into cmake
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_INIT(lms, 3.6.1, test@test)
|
AC_INIT(lms, 3.6.2, test@test)
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
AC_CONFIG_HEADER(src/config/config.h)
|
AC_CONFIG_HEADER(src/config/config.h)
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,10 @@ std::optional<T> readAs(const std::string& str)
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<>
|
||||||
|
std::optional<std::string>
|
||||||
|
readAs(const std::string& str);
|
||||||
|
|
||||||
std::string
|
std::string
|
||||||
replaceInString(const std::string& str, const std::string& from, const std::string& to);
|
replaceInString(const std::string& str, const std::string& from, const std::string& to);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user