Stopped using C++11 because yamlcpp didn't like it

2 files changed, 7 insertions, 5 deletions

@@ -4,6 +4,5 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 bin_PROGRAMS = rawr-ebooks rawr-gen
 rawr_ebooks_SOURCES = ebooks.cpp kgramstats.cpp freevars.cpp
 rawr_gen_SOURCES = gen.cpp kgramstats.cpp freevars.cpp
-rawr_gen_CPPFLAGS = -std=c++11
-rawr_ebooks_CPPFLAGS = $(LIBTWITCURL_CFLAGS) $(YAML_CFLAGS) -std=c++11
+rawr_ebooks_CPPFLAGS = $(LIBTWITCURL_CFLAGS) $(YAML_CFLAGS)
 rawr_ebooks_LDADD = $(LIBTWITCURL_LIBS) $(YAML_LIBS)
\ No newline at end of file
@@ -299,15 +299,18 @@ vector<string> kgramstats::randomSentence(int n)
         return result;
 }
 
+bool removeIf(char c)
+{
+  return !((c != '.') && (c != '"') && (c != '(') && (c != ')') && (c != ','));
+}
+
 std::string canonize(std::string f)
 {
         string canonical(f);
         transform(canonical.begin(), canonical.end(), canonical.begin(), ::tolower);
   
   string result;
-  remove_copy_if(canonical.begin(), canonical.end(), std::back_inserter(result), [] (char c) {
-    return !((c != '.') && (c != '"') && (c != '(') && (c != ')') && (c != ','));
-  });
+  remove_copy_if(canonical.begin(), canonical.end(), std::back_inserter(result), removeIf);
         
         return result;
 }
\ No newline at end of file