From 1a0a8c931f7a2a65eb841e888289f51b1e4fe9f8 Mon Sep 17 00:00:00 2001
From: Jonas Jensen <jonas@semmle.com>
Date: Thu, 13 Dec 2018 09:53:20 +0000
Subject: [PATCH] C++: Fix name clash in data flow imports

The AST-based data flow libraries and the IR-based ones both define
modules `DataFlow`, `DataFlow2`, etc. This caused
`ImportAdditionalLibraries.ql` to fail in compilation.
---
 .../src/filters/ImportAdditionalLibraries.ql  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/cpp/ql/src/filters/ImportAdditionalLibraries.ql b/cpp/ql/src/filters/ImportAdditionalLibraries.ql
index ca4b9856585f..746b376f1dd2 100644
--- a/cpp/ql/src/filters/ImportAdditionalLibraries.ql
+++ b/cpp/ql/src/filters/ImportAdditionalLibraries.ql
@@ -9,15 +9,21 @@
 
 import cpp
 
-import semmle.code.cpp.dataflow.DataFlow
-import semmle.code.cpp.dataflow.DataFlow2
-import semmle.code.cpp.dataflow.DataFlow3
-import semmle.code.cpp.dataflow.DataFlow4
-import semmle.code.cpp.dataflow.TaintTracking
-import semmle.code.cpp.ir.dataflow.DataFlow
-import semmle.code.cpp.ir.dataflow.DataFlow2
-import semmle.code.cpp.ir.dataflow.DataFlow3
-import semmle.code.cpp.ir.dataflow.DataFlow4
+module ASTDataFlow {
+  import semmle.code.cpp.dataflow.DataFlow
+  import semmle.code.cpp.dataflow.DataFlow2
+  import semmle.code.cpp.dataflow.DataFlow3
+  import semmle.code.cpp.dataflow.DataFlow4
+  import semmle.code.cpp.dataflow.TaintTracking
+}
+
+module IRDataFlow {
+  import semmle.code.cpp.ir.dataflow.DataFlow
+  import semmle.code.cpp.ir.dataflow.DataFlow2
+  import semmle.code.cpp.ir.dataflow.DataFlow3
+  import semmle.code.cpp.ir.dataflow.DataFlow4
+}
+
 import semmle.code.cpp.valuenumbering.HashCons
 
 from File f, string tag