From 44705b7f47ca661fcb737648aa5c00092caccf16 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 18 Feb 2015 11:29:28 +0100 Subject: [PATCH 1/3] Fix #872: webadmin checkboxes Don't claim all networks/users have loaded a module when there are none --- modules/data/webadmin/tmpl/add_edit_user.tmpl | 2 +- modules/data/webadmin/tmpl/settings.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl index f0f610fb..2f4ff370 100644 --- a/modules/data/webadmin/tmpl/add_edit_user.tmpl +++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl @@ -206,7 +206,7 @@ + checked="checked" disabled="disabled"/> diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl index ef3f8eb2..934512ca 100644 --- a/modules/data/webadmin/tmpl/settings.tmpl +++ b/modules/data/webadmin/tmpl/settings.tmpl @@ -198,7 +198,7 @@ + checked="checked" disabled="disabled"/> @@ -212,7 +212,7 @@ + checked="checked" disabled="disabled"/> From 11f1efaaac63929f2f37e43842d052bdf82b2054 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sat, 14 Feb 2015 19:45:01 +0100 Subject: [PATCH 2/3] configure: Fix C++11 test with -Werror=missing-declarations This fixes the following error (copied from config.log): conftest.cpp:49:14: error: no previous declaration for 'void test_template_alias_sfinae::test()' [-Werror=missing-declarations] Signed-off-by: Uli Schlachter (cherry picked from commit 2d1336dcf3d620f115aec771ddfb86b199a71e21) --- m4/ax_cxx_compile_stdcxx_11.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 index 7ad01e03..20c8b120 100644 --- a/m4/ax_cxx_compile_stdcxx_11.m4 +++ b/m4/ax_cxx_compile_stdcxx_11.m4 @@ -76,6 +76,8 @@ m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ template void func(member*) {} + void test(); + void test() { func(0); } From 696b07947a40f6534e5b80bcd9345b9a1094e7e1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 23 Feb 2015 09:07:39 +0100 Subject: [PATCH 3/3] CString: fix 'comparision' typos in the docs --- include/znc/ZNCString.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/znc/ZNCString.h b/include/znc/ZNCString.h index 32f9b3d6..6b60d0cc 100644 --- a/include/znc/ZNCString.h +++ b/include/znc/ZNCString.h @@ -159,7 +159,7 @@ public: /** * Check if this string is equal to some other string. * @param s The string to compare to. - * @param cs CaseSensitive if you want the comparision to be case + * @param cs CaseSensitive if you want the comparison to be case * sensitive, CaseInsensitive (default) otherwise. * @return True if the strings are equal. */ @@ -493,21 +493,21 @@ public: /** Find the position of the given substring. * @param s The substring to search for. - * @param cs CaseSensitive if you want the comparision to be case + * @param cs CaseSensitive if you want the comparison to be case * sensitive, CaseInsensitive (default) otherwise. * @return The position of the substring if found, CString::npos otherwise. */ size_t Find(const CString& s, CaseSensitivity cs = CaseInsensitive) const; /** Check whether the string starts with a given prefix. * @param sPrefix The prefix. - * @param cs CaseSensitive if you want the comparision to be case + * @param cs CaseSensitive if you want the comparison to be case * sensitive, CaseInsensitive (default) otherwise. * @return True if the string starts with prefix, false otherwise. */ bool StartsWith(const CString& sPrefix, CaseSensitivity cs = CaseInsensitive) const; /** Check whether the string ends with a given suffix. * @param sSuffix The suffix. - * @param cs CaseSensitive if you want the comparision to be case + * @param cs CaseSensitive if you want the comparison to be case * sensitive, CaseInsensitive (default) otherwise. * @return True if the string ends with suffix, false otherwise. */