commit 35f0c0b0fbba697d300f165d706bfaa155ea5991
author Yangqing Jia <jiayq84@gmail.com> Sun Mar 05 21:05:14 2017 -0800
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Sun Mar 05 21:17:53 2017 -0800
tree 7a0ab166b3b2fb79826e9b4460c3268c27b29d08
parent aef75ca5dd466fb827190d6016a6782017b39dc0

Fix gflags build

Summary:
Our internal update of gflags in https://github.com/caffe2/caffe2/commit/b0e325ce69aeb49c28124b189be68aea83a656ef called for this change.
Closes https://github.com/caffe2/caffe2/pull/185

Differential Revision: D4657928

Pulled By: Yangqing

fbshipit-source-id: bdf9fdc63a16dafc28b690598463ec72e3c50f40

caffe2/core/flags.h

diff --git a/caffe2/core/flags.h b/caffe2/core/flags.h
index 9e5f822..7e09123 100644
--- a/caffe2/core/flags.h
+++ b/caffe2/core/flags.h
@@ -58,6 +58,12 @@
 
 #include <gflags/gflags.h>
 
+// gflags before 2.0 uses namespace google and after 2.1 uses namespace gflags.
+// Using GFLAGS_GFLAGS_H_ to capture this change.
+#ifndef GFLAGS_GFLAGS_H_
+namespace gflags = google;
+#endif  // GFLAGS_GFLAGS_H_
+
 #define CAFFE2_GFLAGS_DEF_WRAPPER(type, name, default_value, help_str)         \
   DEFINE_##type(name, default_value, help_str);                                \
   namespace caffe2 {                                                           \