From 6143b462e4d0e5caed25cf0ee0a2ebb2c7dbfd1c Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Sun, 11 Aug 2019 20:14:23 -0700 Subject: [PATCH 1/3] When compiling with nvcc, don't use ARROW_DEPRECATED on using statement --- cpp/src/arrow/io/interfaces.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/arrow/io/interfaces.h b/cpp/src/arrow/io/interfaces.h index 3a5cfe3d7788..690daf78f379 100644 --- a/cpp/src/arrow/io/interfaces.h +++ b/cpp/src/arrow/io/interfaces.h @@ -191,7 +191,7 @@ class ARROW_EXPORT ReadWriteFileInterface : public RandomAccessFile, public Writ }; // TODO(kszucs): remove this after 0.13 -#ifndef _MSC_VER +#if not defined(_MSC_VER) && not defined(__CUDACC__) using WriteableFile ARROW_DEPRECATED("Use WritableFile") = WritableFile; using ReadableFileInterface ARROW_DEPRECATED("Use RandomAccessFile") = RandomAccessFile; #else From b129d56fbbb27daf1e21058c8f1b6e52e40a0fa0 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Mon, 12 Aug 2019 03:43:35 -0700 Subject: [PATCH 2/3] fix preprocessor macro logic --- cpp/src/arrow/io/interfaces.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/arrow/io/interfaces.h b/cpp/src/arrow/io/interfaces.h index 690daf78f379..5480d944a44f 100644 --- a/cpp/src/arrow/io/interfaces.h +++ b/cpp/src/arrow/io/interfaces.h @@ -191,7 +191,7 @@ class ARROW_EXPORT ReadWriteFileInterface : public RandomAccessFile, public Writ }; // TODO(kszucs): remove this after 0.13 -#if not defined(_MSC_VER) && not defined(__CUDACC__) +#if !defined(_MSC_VER) && !defined(__CUDACC__) using WriteableFile ARROW_DEPRECATED("Use WritableFile") = WritableFile; using ReadableFileInterface ARROW_DEPRECATED("Use RandomAccessFile") = RandomAccessFile; #else From f4d89b3104d186ff0e9b1aad809a7a3b95884c11 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Mon, 12 Aug 2019 19:15:44 -0700 Subject: [PATCH 3/3] remove deprecated aliases in interfaces.h --- cpp/src/arrow/io/interfaces.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cpp/src/arrow/io/interfaces.h b/cpp/src/arrow/io/interfaces.h index 5480d944a44f..678366bd7f67 100644 --- a/cpp/src/arrow/io/interfaces.h +++ b/cpp/src/arrow/io/interfaces.h @@ -190,16 +190,6 @@ class ARROW_EXPORT ReadWriteFileInterface : public RandomAccessFile, public Writ ReadWriteFileInterface() { RandomAccessFile::set_mode(FileMode::READWRITE); } }; -// TODO(kszucs): remove this after 0.13 -#if !defined(_MSC_VER) && !defined(__CUDACC__) -using WriteableFile ARROW_DEPRECATED("Use WritableFile") = WritableFile; -using ReadableFileInterface ARROW_DEPRECATED("Use RandomAccessFile") = RandomAccessFile; -#else -// MSVC does not like using ARROW_DEPRECATED with using declarations -using WriteableFile = WritableFile; -using ReadableFileInterface = RandomAccessFile; -#endif - } // namespace io } // namespace arrow