From ca89e7167de53256006e88b0b2ffed5a7edf9e20 Mon Sep 17 00:00:00 2001
From: Nicolas Vasilache <ntv@google.com>
Date: Mon, 8 Apr 2019 05:07:01 -0700
Subject: [PATCH]     Fix build for the Linalg example dialect with MacOS

--

PiperOrigin-RevId: 242443831
---
 mlir/examples/CMakeLists.txt                  | 1 +
 mlir/examples/Linalg/Linalg1/lib/Analysis.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mlir/examples/CMakeLists.txt b/mlir/examples/CMakeLists.txt
index 9dc01fe4f101..ea992c98baa3 100644
--- a/mlir/examples/CMakeLists.txt
+++ b/mlir/examples/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(toy)
+add_subdirectory(Linalg)
 
diff --git a/mlir/examples/Linalg/Linalg1/lib/Analysis.cpp b/mlir/examples/Linalg/Linalg1/lib/Analysis.cpp
index 7a11a85c5ce5..ecb6309466a9 100644
--- a/mlir/examples/Linalg/Linalg1/lib/Analysis.cpp
+++ b/mlir/examples/Linalg/Linalg1/lib/Analysis.cpp
@@ -59,7 +59,7 @@ std::pair<mlir::Value *, unsigned> linalg::getViewRootIndexing(Value *view,
     if (auto rangeOp = indexing->getDefiningOp()->cast<RangeOp>()) {
       // If I sliced with a range and I sliced at this dim, then I'm it.
       if (dim == sliceDim) {
-        return make_pair(rangeOp.getResult(), dim);
+        return std::make_pair(rangeOp.getResult(), dim);
       }
       // Otherwise, I did not change the rank, just go look for `dim` into my
       // parent.