From bc9a491033ae63c8defd5d10c159ab123488dc20 Mon Sep 17 00:00:00 2001
From: Rodrigo Queiro <rodrigoq@google.com>
Date: Wed, 31 Jan 2018 14:00:25 +0100
Subject: [PATCH] Allow using glog/stl_logging.h with Bazel

Fixes #289.
---
 bazel/example/main.cc | 5 +++++
 bazel/glog.bzl        | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bazel/example/main.cc b/bazel/example/main.cc
index da5c020..ad15b14 100644
--- a/bazel/example/main.cc
+++ b/bazel/example/main.cc
@@ -1,5 +1,6 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
+#include <glog/stl_logging.h>
 
 int main(int argc, char* argv[]) {
   // Initialize Google's logging library.
@@ -10,5 +11,9 @@ int main(int argc, char* argv[]) {
 
   LOG(INFO) << "Hello, world!";
 
+  // glog/stl_logging.h allows logging STL containers.
+  std::vector<int> x {1, 2, 3};
+  LOG(INFO) << "ABC, it's easy as " << x;
+
   return 0;
 }
diff --git a/bazel/glog.bzl b/bazel/glog.bzl
index 95fd110..b33f1aa 100644
--- a/bazel/glog.bzl
+++ b/bazel/glog.bzl
@@ -89,7 +89,8 @@ def glog_library(namespace='google', with_gflags=1):
         cmd = r'''\
 #!/bin/sh
 cat > $@ <<"EOF"
-sed -e 's/@ac_cv_have_unistd_h@/1/g' \
+sed -e 's/@ac_cv_cxx_using_operator@/1/g' \
+    -e 's/@ac_cv_have_unistd_h@/1/g' \
     -e 's/@ac_cv_have_stdint_h@/1/g' \
     -e 's/@ac_cv_have_systypes_h@/1/g' \
     -e 's/@ac_cv_have_libgflags_h@/1/g' \
-- 
2.7.4