summaryrefslogtreecommitdiff
path: root/src/strings
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-10-31 12:28:25 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-10-31 12:28:25 -0700
commit59664c19a3f2bd9e9343cec07f1ca6ca48b61a55 (patch)
tree1c46def7d6f1b8273bed04d713a269c0cf85f7b4 /src/strings
parent6f7a6bd270d2e550bd0ad14be82d40c06132931a (diff)
downloadtmwa-59664c19a3f2bd9e9343cec07f1ca6ca48b61a55.tar.gz
tmwa-59664c19a3f2bd9e9343cec07f1ca6ca48b61a55.tar.bz2
tmwa-59664c19a3f2bd9e9343cec07f1ca6ca48b61a55.tar.xz
tmwa-59664c19a3f2bd9e9343cec07f1ca6ca48b61a55.zip
Fix ladmin account creation
Diffstat (limited to 'src/strings')
-rw-r--r--src/strings/base.tcc2
-rw-r--r--src/strings/base_test.cpp10
2 files changed, 11 insertions, 1 deletions
diff --git a/src/strings/base.tcc b/src/strings/base.tcc
index cde277f..491b4ca 100644
--- a/src/strings/base.tcc
+++ b/src/strings/base.tcc
@@ -261,7 +261,7 @@ namespace strings
template<class T, class O, class P>
bool _crtp_string<T, O, P>::contains_any(XPair s) const
{
- return std::find_if(s.begin(), s.end(), [this](char c) { return this->contains(c); }) != end();
+ return std::find_if(s.begin(), s.end(), [this](char c) { return this->contains(c); }) != s.end();
}
template<class T, class O, class P>
diff --git a/src/strings/base_test.cpp b/src/strings/base_test.cpp
index 836ea4b..cb41fa9 100644
--- a/src/strings/base_test.cpp
+++ b/src/strings/base_test.cpp
@@ -1,4 +1,7 @@
#include "base.hpp"
+
+#include <gtest/gtest.h>
+
#include "vstring.hpp"
#include "xstring.hpp"
#include "fstring.hpp"
@@ -16,3 +19,10 @@ static_assert(!string_comparison_allowed<_test, _test2>::value, "t2");
static_assert(string_comparison_allowed<VString<1>, XString>::value, "vx");
static_assert(string_comparison_allowed<XString, XString>::value, "xx");
static_assert(string_comparison_allowed<XString, FString>::value, "xf");
+
+TEST(strings, contains)
+{
+ XString hi = "Hello";
+ EXPECT_TRUE(hi.contains_any("Hi"));
+ EXPECT_FALSE(hi.contains_any("hi"));
+}