Filter fix: support bison 2.6

Bison 2.6 generates warnings and errors if filter-ast.h is not included
before filter-parser.h.

Reported-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/lib/lttng-ctl/filter-ast.h b/src/lib/lttng-ctl/filter-ast.h
index a42ac164d605d0dfe1cae5f27a6c18ec427153f7..97793c00bf7f199fea49aa508282552b6ce4bf84 100644 (file)
--- a/src/lib/lttng-ctl/filter-ast.h
+++ b/src/lib/lttng-ctl/filter-ast.h
@@ -22,6 +22,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/*
+ * Note: filter-ast.h should be included before filter-parser.h.
+ */
+
 #include <urcu/list.h>
 #include <stdint.h>
 

diff --git a/src/lib/lttng-ctl/filter-grammar-test.c b/src/lib/lttng-ctl/filter-grammar-test.c
index b47b1e9500c5b3a1d7f44112955a877f4fd972c3..2b9a27dc299543beb38e3191ecd662c406121e40 100644 (file)
--- a/src/lib/lttng-ctl/filter-grammar-test.c
+++ b/src/lib/lttng-ctl/filter-grammar-test.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 #include "filter-bytecode.h"
 
 int main(int argc, char **argv)

diff --git a/src/lib/lttng-ctl/filter-parser.y b/src/lib/lttng-ctl/filter-parser.y
index d6f00a095e35f934019145a28dcd94ebe2cdd21d..ea433522d02962f9ab78622a19b0d03bf901bf3a 100644 (file)
--- a/src/lib/lttng-ctl/filter-parser.y
+++ b/src/lib/lttng-ctl/filter-parser.y
@@ -29,8 +29,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 
 int yydebug;
 int filter_parser_debug = 0;

diff --git a/src/lib/lttng-ctl/filter-visitor-generate-ir.c b/src/lib/lttng-ctl/filter-visitor-generate-ir.c
index dd0d7ffaf7137fc49f938462e4e7c4950a5a9cd8..899713ee6aab6ff27870ce70bb7ce8020290ad4a 100644 (file)
--- a/src/lib/lttng-ctl/filter-visitor-generate-ir.c
+++ b/src/lib/lttng-ctl/filter-visitor-generate-ir.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 #include "filter-ir.h"
 
 static

diff --git a/src/lib/lttng-ctl/filter-visitor-ir-check-binary-comparator.c b/src/lib/lttng-ctl/filter-visitor-ir-check-binary-comparator.c
index fff9b51689b587f0df69705aae1b54990b57232c..13da71edbbeed1a2d4eb548f1b1e251ef5987221 100644 (file)
--- a/src/lib/lttng-ctl/filter-visitor-ir-check-binary-comparator.c
+++ b/src/lib/lttng-ctl/filter-visitor-ir-check-binary-comparator.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 #include "filter-ir.h"
 
 static

diff --git a/src/lib/lttng-ctl/filter-visitor-ir-check-binary-op-nesting.c b/src/lib/lttng-ctl/filter-visitor-ir-check-binary-op-nesting.c
index 64048a5844a6cba2e88391c4009f612309f0e512..08488deffb243684968aca5fdc8f9412dfb5bf67 100644 (file)
--- a/src/lib/lttng-ctl/filter-visitor-ir-check-binary-op-nesting.c
+++ b/src/lib/lttng-ctl/filter-visitor-ir-check-binary-op-nesting.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 #include "filter-ir.h"
 
 static

diff --git a/src/lib/lttng-ctl/filter-visitor-set-parent.c b/src/lib/lttng-ctl/filter-visitor-set-parent.c
index 2cc5f53f62275d0fbd372ee37424ca4bc29ec04a..2ad707f6d9c44afc5cfd766a1a6dd11f9c8e1b4a 100644 (file)
--- a/src/lib/lttng-ctl/filter-visitor-set-parent.c
+++ b/src/lib/lttng-ctl/filter-visitor-set-parent.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 
 static
 int update_child(struct filter_node *parent,

diff --git a/src/lib/lttng-ctl/filter-visitor-xml.c b/src/lib/lttng-ctl/filter-visitor-xml.c
index bf52724ef4df253bcdfa715cbd4589b7772b152d..b3a1ac9597ca7c1904b58328bc874accf6f7a490 100644 (file)
--- a/src/lib/lttng-ctl/filter-visitor-xml.c
+++ b/src/lib/lttng-ctl/filter-visitor-xml.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 
 #define fprintf_dbg(fd, fmt, args...)  fprintf(fd, "%s: " fmt, __func__, ## args)
 

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index b6487b7c25f51c490ecb3f3bf28343244a6b680d..ba0c4c8269a301d31c0183c02592f0d77e363b8e 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -33,8 +33,8 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <lttng/lttng.h>
 
-#include "filter-parser.h"
 #include "filter-ast.h"
+#include "filter-parser.h"
 #include "filter-bytecode.h"
 #include "memstream.h"