summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-05-31 16:02:42 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2015-05-31 16:02:42 +0100
commit26bc6233ceba2967f682a76dc2ee82c79f0fce90 (patch)
treefd8ec0b4f9e0e9a711170f689c02e3dcba397437
parentSwitch to using a flex based parser, not a hand-rolled character consumer (diff)
downloadlibjsonpp-26bc6233ceba2967f682a76dc2ee82c79f0fce90.tar.bz2
libjsonpp-26bc6233ceba2967f682a76dc2ee82c79f0fce90.tar.xz
libjsonpp-26bc6233ceba2967f682a76dc2ee82c79f0fce90.zip
Correctly prefix the lexer and move the warning disabling into the specific filelibjsonpp-0.9.1
-rw-r--r--libjsonpp/Jamfile.jam2
-rw-r--r--libjsonpp/json.ll2
2 files changed, 3 insertions, 1 deletions
diff --git a/libjsonpp/Jamfile.jam b/libjsonpp/Jamfile.jam
index 2983e68..4114e6c 100644
--- a/libjsonpp/Jamfile.jam
+++ b/libjsonpp/Jamfile.jam
@@ -20,7 +20,7 @@ lib jsonpp :
:
<include>.
<library>glibmm
- <cflags>-Wno-error=sign-compare
+ <define>yyFlexLexer=jsonBaseFlexLexer
: :
<include>.
;
diff --git a/libjsonpp/json.ll b/libjsonpp/json.ll
index 94be11f..aae3ed2 100644
--- a/libjsonpp/json.ll
+++ b/libjsonpp/json.ll
@@ -5,11 +5,13 @@
%option stack
%option yylineno
%option yyclass="json::jsonFlexLexer"
+%option prefix="jsonBase"
%{
#include "jsonFlexLexer.h"
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp>
+#pragma GCC diagnostic ignored "-Wsign-compare"
%}
beginobj "{"