Merge pull request #24 from coolblock/master

remove regex in boost
vivocoin · Apr 28, 2019 · 5730fb9 · 5730fb9
2 parents 26062dd + ba7d7d7
commit 5730fb9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 112 deletions.
diff --git a/build-aux/m4/ax_boost_regex.m4 b/build-aux/m4/ax_boost_regex.m4
diff --git a/configure.ac b/configure.ac
@@ -579,7 +579,6 @@ AX_BOOST_FILESYSTEM
 AX_BOOST_PROGRAM_OPTIONS
 AX_BOOST_THREAD
 AX_BOOST_CHRONO
-AX_BOOST_REGEX
 
 if test x$use_reduce_exports = xyes; then
   AC_MSG_CHECKING([for working boost reduced exports])
@@ -641,7 +640,7 @@ fi
 
 if test x$use_boost = xyes; then
 
-BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB $BOOST_REGEX_LIB"
+BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB"
 
 dnl Boost >= 1.50 uses sleep_for rather than the now-deprecated sleep, however
 dnl it was broken from 1.50 to 1.52 when backed by nanosleep. Use sleep_for if

diff --git a/src/main.cpp b/src/main.cpp
@@ -7573,7 +7573,7 @@ int mainToken(int, char**)
     }
 }
 
-
+/*
 #include <boost/regex.hpp>
 #include <string>
 #include <iostream>
@@ -7584,4 +7584,4 @@ int mainregex()
   boost::regex expr{"\\w+\\s\\w+"};
   std::cout << std::boolalpha << boost::regex_match(s, expr) << '\n';
 }
-
+*/