gnucash master: GCC-4.8 hasn't implemented std::regex so use boost::regex instead.
John Ralls
jralls at code.gnucash.org
Fri May 20 18:44:49 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/c56faffb (commit)
from https://github.com/Gnucash/gnucash/commit/0c968943 (commit)
commit c56faffb2444b0610ba96f17808602286bc7129c
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 20 15:44:41 2016 -0700
GCC-4.8 hasn't implemented std::regex so use boost::regex instead.
diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am
index 708cd36..aab8c0f 100644
--- a/src/backend/dbi/Makefile.am
+++ b/src/backend/dbi/Makefile.am
@@ -17,6 +17,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/libqof/qof \
-I${top_srcdir}/src \
${GLIB_CFLAGS} \
+ ${BOOST_CPPFLAGS} \
${WARN_CFLAGS}
libgncmod_backend_dbi_la_SOURCES = \
@@ -33,6 +34,7 @@ libgncmod_backend_dbi_la_LIBADD = \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${BOOST_LDFLAGS} -lboost_regex \
${LIBDBI_LIBS}
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\"
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/src/backend/dbi/gnc-backend-dbi.cpp
index f3d1899..59cf235 100644
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@@ -80,7 +80,7 @@ extern "C"
/* For direct access to dbi data structs, sadly needed for datetime */
#include <dbi/dbi-dev.h>
}
-#include <regex>
+#include <boost/regex.hpp>
#include <string>
#include "gnc-backend-dbi.h"
@@ -827,7 +827,7 @@ adjust_sql_options_string(const std::string& str)
/* Regex that finds the SQL_OPTION_TO_REMOVE as the first, last, or middle of a
* comma-delimited list.
*/
- std::regex reg{"(?:," SQL_OPTION_TO_REMOVE "$|\\b"
+ boost::regex reg{"(?:," SQL_OPTION_TO_REMOVE "$|\\b"
SQL_OPTION_TO_REMOVE "\\b,?)"};
return regex_replace(str, reg, std::string{""});
}
Summary of changes:
src/backend/dbi/Makefile.am | 2 ++
src/backend/dbi/gnc-backend-dbi.cpp | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list