Remove DISALLOW_COPY_AND_ASSIGN from some abstract classes. Revert MANUALLY_ALIGNED_STRUCT

wesm · wesm · commit 2a4db73fbfde · 2017-09-03T13:02:06.000-04:00
Change-Id: Iee3234b51ec20081ee8e4cfdcac7653ec28f8b2a
diff --git a/cpp/src/arrow/array.h b/cpp/src/arrow/array.h
@@ -254,9 +254,6 @@ class ARROW_EXPORT Array {
     }
     data_ = data;
   }
-
- private:
-  ARROW_DISALLOW_COPY_AND_ASSIGN(Array);
 };
 
 static inline std::ostream& operator<<(std::ostream& os, const Array& x) {
diff --git a/cpp/src/arrow/builder.h b/cpp/src/arrow/builder.h
@@ -154,9 +154,6 @@ class ARROW_EXPORT ArrayBuilder {
   void UnsafeAppendToBitmap(const uint8_t* valid_bytes, int64_t length);
   // Set the next length bits to not null (i.e. valid).
   void UnsafeSetNotNull(int64_t length);
-
- private:
-  ARROW_DISALLOW_COPY_AND_ASSIGN(ArrayBuilder);
 };
 
 class ARROW_EXPORT NullBuilder : public ArrayBuilder {
diff --git a/cpp/src/arrow/io/interfaces.h b/cpp/src/arrow/io/interfaces.h
@@ -79,9 +79,6 @@ class ARROW_EXPORT FileInterface {
   FileInterface() {}
   FileMode::type mode_;
   void set_mode(FileMode::type mode) { mode_ = mode; }
-
- private:
-  ARROW_DISALLOW_COPY_AND_ASSIGN(FileInterface);
 };
 
 class ARROW_EXPORT Seekable {
diff --git a/cpp/src/arrow/type.h b/cpp/src/arrow/type.h
@@ -157,9 +157,6 @@ class ARROW_EXPORT DataType {
  protected:
   Type::type id_;
   std::vector<std::shared_ptr<Field>> children_;
-
- private:
-  ARROW_DISALLOW_COPY_AND_ASSIGN(DataType);
 };
 
 // TODO(wesm): Remove this from parquet-cpp
diff --git a/cpp/src/arrow/util/compiler-util.h b/cpp/src/arrow/util/compiler-util.h
@@ -0,0 +1,25 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// Deprecated header, here for backwards compatibility in parquet-cpp
+
+#ifndef ARROW_UTIL_COMPILER_UTIL_H
+#define ARROW_UTIL_COMPILER_UTIL_H
+
+#include "arrow/util/macros.h"
+
+#endif  // ARROW_UTIL_COMPILER_UTIL_H
diff --git a/cpp/src/arrow/util/macros.h b/cpp/src/arrow/util/macros.h
@@ -61,20 +61,22 @@
 // macros to disable padding
 // these macros are portable across different compilers and platforms
 //[https://github.com/google/flatbuffers/blob/master/include/flatbuffers/flatbuffers.h#L1355]
+#if !defined(MANUALLY_ALIGNED_STRUCT)
 #if defined(_MSC_VER)
-#define ARROW_MANUALLY_ALIGNED_STRUCT(alignment) \
+#define MANUALLY_ALIGNED_STRUCT(alignment) \
   __pragma(pack(1));                             \
   struct __declspec(align(alignment))
 #define STRUCT_END(name, size) \
   __pragma(pack());            \
   static_assert(sizeof(name) == size, "compiler breaks packing rules")
 #elif defined(__GNUC__) || defined(__clang__)
-#define ARROW_MANUALLY_ALIGNED_STRUCT(alignment) \
+#define MANUALLY_ALIGNED_STRUCT(alignment) \
   _Pragma("pack(1)") struct __attribute__((aligned(alignment)))
 #define STRUCT_END(name, size) \
   _Pragma("pack()") static_assert(sizeof(name) == size, "compiler breaks packing rules")
 #else
 #error Unknown compiler, please define structure alignment macros
 #endif
+#endif // !defined(MANUALLY_ALIGNED_STRUCT)
 
 #endif  // ARROW_UTIL_MACROS_H

Original file line number	Diff line number	Diff line change
`@@ -254,9 +254,6 @@ class ARROW_EXPORT Array {`
`254`	`254`	`}`
`255`	`255`	`data_ = data;`
`256`	`256`	`}`
`257`		`-`
`258`		`- private:`
`259`		`- ARROW_DISALLOW_COPY_AND_ASSIGN(Array);`
`260`	`257`	`};`
`261`	`258`
`262`	`259`	`static inline std::ostream& operator<<(std::ostream& os, const Array& x) {`