From bc4f09b23ea3604ffab80b9d765b409d9c5003c8 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Sat, 9 Jul 2016 13:26:25 -0700 Subject: [PATCH] Do not define macro if has been defined elsewhere --- src/parquet/util/macros.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/parquet/util/macros.h b/src/parquet/util/macros.h index 8f704b22..22645c28 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