parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-657: Do not define DISALLOW_COPY_AND_ASSIGN if already defined
Date Sun, 10 Jul 2016 19:35:55 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master cce6e2d66 -> 1e80321d2


PARQUET-657: Do not define DISALLOW_COPY_AND_ASSIGN if already defined

This can cause conflicts with other libraries that also use this common macro (from Google's
gutil library originally)

Author: Wes McKinney <wesm@apache.org>

Closes #135 from wesm/PARQUET-657 and squashes the following commits:

bc4f09b [Wes McKinney] Do not define macro if has been defined elsewhere


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/1e80321d
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/1e80321d
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/1e80321d

Branch: refs/heads/master
Commit: 1e80321d29fbba5d34e691f7361ec2043490c6cc
Parents: cce6e2d
Author: Wes McKinney <wesm@apache.org>
Authored: Sun Jul 10 12:35:48 2016 -0700
Committer: Wes McKinney <wesm@apache.org>
Committed: Sun Jul 10 12:35:48 2016 -0700

----------------------------------------------------------------------
 src/parquet/util/macros.h | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/1e80321d/src/parquet/util/macros.h
----------------------------------------------------------------------
diff --git a/src/parquet/util/macros.h b/src/parquet/util/macros.h
index 8f704b2..22645c2 100644
--- a/src/parquet/util/macros.h
+++ b/src/parquet/util/macros.h
@@ -21,9 +21,11 @@
 // Useful macros from elsewhere
 
 // From Google gutil
+#ifndef DISALLOW_COPY_AND_ASSIGN
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&) = delete;      \
   void operator=(const TypeName&) = delete
+#endif
 
 // ----------------------------------------------------------------------
 // From googletest


Mime
View raw message