From 26bc6233ceba2967f682a76dc2ee82c79f0fce90 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 31 May 2015 16:02:42 +0100
Subject: Correctly prefix the lexer and move the warning disabling into the
 specific file

---
 libjsonpp/Jamfile.jam | 2 +-
 libjsonpp/json.ll     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 "{"
-- 
cgit v1.2.3