Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

Commit 1e80321

Browse files
committed
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
1 parent cce6e2d commit 1e80321

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

src/parquet/util/macros.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
// Useful macros from elsewhere
2222

2323
// From Google gutil
24+
#ifndef DISALLOW_COPY_AND_ASSIGN
2425
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
2526
TypeName(const TypeName&) = delete; \
2627
void operator=(const TypeName&) = delete
28+
#endif
2729

2830
// ----------------------------------------------------------------------
2931
// From googletest

0 commit comments

Comments
 (0)