This repository was archived by the owner on May 10, 2024. It is now read-only.
Commit 1e80321
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 elsewhere1 parent cce6e2d commit 1e80321
1 file changed
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| 28 | + | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| |||
0 commit comments