commit 08c41f61f4f5f17728c9e0f48640eaa32588b63b
author Marius Brehler <marius.brehler@iml.fraunhofer.de> Wed Sep 16 22:14:15 2020 +0200
committer Marius Brehler <marius.brehler@iml.fraunhofer.de> Wed Sep 16 22:14:15 2020 +0200
tree 00591dcd5a9e59d28fe1131589c70a65ed159398
parent 5dfc6b09104202d662efc7cb93d17c94eb269df7
parent f4c6730972dc9c7f16fb929c8684718becefe650

Merge branch 'master' into iree

include/emitc/Dialect/EmitC/EmitC.td

diff --git a/include/emitc/Dialect/EmitC/EmitC.td b/include/emitc/Dialect/EmitC/EmitC.td
index b76622d..3a4047b 100644
--- a/include/emitc/Dialect/EmitC/EmitC.td
+++ b/include/emitc/Dialect/EmitC/EmitC.td
@@ -17,7 +17,7 @@
 
 def EmitC_Dialect : Dialect {
   let name = "emitc";
-  let cppNamespace = "emitc";
+  let cppNamespace = "::mlir::emitc";
 }
 
 // Base class for EmitC dialect ops.

include/emitc/Dialect/EmitC/EmitCDialect.h

diff --git a/include/emitc/Dialect/EmitC/EmitCDialect.h b/include/emitc/Dialect/EmitC/EmitCDialect.h
index 73dacdf..48b5bf2 100644
--- a/include/emitc/Dialect/EmitC/EmitCDialect.h
+++ b/include/emitc/Dialect/EmitC/EmitCDialect.h
@@ -18,15 +18,9 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
-namespace mlir {
-namespace emitc {
-
 #define GET_OP_CLASSES
 #include "emitc/Dialect/EmitC/EmitC.h.inc"
 
 #include "emitc/Dialect/EmitC/EmitCDialect.h.inc"
 
-} // namespace emitc
-} // namespace mlir
-
 #endif // MLIR_DIALECT_EMITC_EMITCDIALECT_H

lib/Dialect/EmitC/IR/EmitCDialect.cpp

diff --git a/lib/Dialect/EmitC/IR/EmitCDialect.cpp b/lib/Dialect/EmitC/IR/EmitCDialect.cpp
index 992e66e..721db57 100644
--- a/lib/Dialect/EmitC/IR/EmitCDialect.cpp
+++ b/lib/Dialect/EmitC/IR/EmitCDialect.cpp
@@ -26,9 +26,5 @@
   allowUnknownOperations();
 }
 
-namespace mlir {
-namespace emitc {
 #define GET_OP_CLASSES
 #include "emitc/Dialect/EmitC/EmitC.cpp.inc"
-} // namespace emitc
-} // namespace mlir