Skip to content

Commit c1a6f96

Browse files
committed
Several changes:
- Wt::Dbo WLogger: fix infinite recursion - SqlQueryParse: require C++14 for X3 parser
1 parent 6eedff2 commit c1a6f96

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Wt/Dbo/SqlQueryParse.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include <boost/version.hpp>
1414

15-
#if !defined(WT_NO_SPIRIT) && BOOST_VERSION >= 106900
15+
#if !defined(WT_NO_SPIRIT) && defined(WT_CXX14) && BOOST_VERSION >= 106900
1616
# define X3_QUERY_PARSE
1717
#elif !defined(WT_NO_SPIRIT) && BOOST_VERSION >= 104100
1818
# define SPIRIT_QUERY_PARSE

src/Wt/WLogger.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ bool logging(const std::string &type,
410410
if (customLogger_)
411411
return customLogger_->logging(type, scope);
412412

413-
return logging(type, scope);
413+
return true;
414414
#else // WT_DBO_LOGGER
415415
WebSession *session = WebSession::instance();
416416

0 commit comments

Comments
 (0)