Merge branch 'master' into win32-x64-working

Conflicts: include/flag.h
2015-06-16 06:34:05 -04:00
parent fccf0e8c23 b33c3381e6
commit 833d308c7e
3 changed files with 3 additions and 3 deletions
--- a/sys/share/cppregex.cpp
+++ b/sys/share/cppregex.cpp
@@ -10,7 +10,7 @@
 extern "C" {
  #include <hack.h>

-  const char regex_id[] = "cppregex";
+  char regex_id[] = "cppregex";

  struct nhregex {
    std::unique_ptr<std::regex> re;