File tree Expand file tree Collapse file tree 7 files changed +44
-3
lines changed
Expand file tree Collapse file tree 7 files changed +44
-3
lines changed Original file line number Diff line number Diff line change 5757#include " parquet/thrift_internal.h" // IWYU pragma: keep
5858#include " parquet/windows_fixup.h" // for OPTIONAL
5959
60+ #ifdef _MSC_VER
61+ // disable warning about inheritance via dominance in the diamond pattern
62+ # pragma warning(disable : 4250)
63+ #endif
64+
6065using arrow::MemoryPool;
6166using arrow::internal::AddWithOverflow;
6267using arrow::internal::checked_cast;
Original file line number Diff line number Diff line change 5353#include " parquet/schema.h"
5454#include " parquet/types.h"
5555
56+ #ifdef _MSC_VER
57+ // disable warning about inheritance via dominance in the diamond pattern
58+ # pragma warning(disable : 4250)
59+ #endif
60+
5661namespace bit_util = arrow::bit_util;
5762
5863using arrow::Status;
Original file line number Diff line number Diff line change 4949#include " parquet/schema.h"
5050#include " parquet/types.h"
5151
52+ #ifdef _MSC_VER
53+ // disable warning about inheritance via dominance in the diamond pattern
54+ # pragma warning(disable : 4250)
55+ #endif
56+
5257namespace bit_util = arrow::bit_util;
5358
5459using arrow::Status;
Original file line number Diff line number Diff line change 2626#include " arrow/util/string_util.h"
2727#include " parquet/platform.h"
2828
29+ #ifdef _MSC_VER
30+ # pragma warning(push)
31+ // Disable warning for STL types usage in DLL interface
32+ // https://web.archive.org/web/20130317015847/http://connect.microsoft.com/VisualStudio/feedback/details/696593/vc-10-vs-2010-basic-string-exports
33+ # pragma warning(disable : 4275 4251)
34+ // Disable diamond inheritance warnings
35+ # pragma warning(disable : 4250)
36+ // Disable macro redefinition warnings
37+ # pragma warning(disable : 4005)
38+ // Disable extern before exported template warnings
39+ # pragma warning(disable : 4910)
40+ #endif
41+
2942// PARQUET-1085
3043#if !defined(ARROW_UNUSED)
3144# define ARROW_UNUSED (x ) UNUSED(x)
8497
8598namespace parquet {
8699
87- class ParquetException : public std ::exception {
100+ class PARQUET_EXPORT ParquetException : public std::exception {
88101 public:
89102 PARQUET_NORETURN static void EofException (const std::string& msg = " " ) {
90103 static std::string prefix = " Unexpected end of stream" ;
@@ -156,3 +169,7 @@ void ThrowNotOk(StatusReturnBlock&& b) {
156169}
157170
158171} // namespace parquet
172+
173+ #ifdef _MSC_VER
174+ # pragma warning(pop)
175+ #endif
Original file line number Diff line number Diff line change 2222
2323namespace parquet {
2424// Abstract class for hash
25- class Hasher {
25+ class PARQUET_EXPORT Hasher {
2626 public:
2727 // / Compute hash for 32 bits value by using its plain encoding result.
2828 // /
Original file line number Diff line number Diff line change 2828
2929#if defined(_WIN32) || defined(__CYGWIN__)
3030
31- # if defined( _MSC_VER)
31+ # ifdef _MSC_VER
3232# pragma warning(push)
3333// Disable warning for STL types usage in DLL interface
3434// https://web.archive.org/web/20130317015847/http://connect.microsoft.com/VisualStudio/feedback/details/696593/vc-10-vs-2010-basic-string-exports
@@ -110,3 +110,7 @@ std::shared_ptr<ResizableBuffer> AllocateBuffer(
110110 ::arrow::MemoryPool* pool = ::arrow::default_memory_pool(), int64_t size = 0);
111111
112112} // namespace parquet
113+
114+ #ifdef _MSC_VER
115+ # pragma warning(pop)
116+ #endif
Original file line number Diff line number Diff line change 3939
4040#include " generated/parquet_types.h"
4141
42+ #ifdef _MSC_VER
43+ // disable warning about inheritance via dominance in the diamond pattern
44+ # pragma warning(disable : 4250)
45+ #endif
46+
4247using arrow::internal::checked_cast;
4348using arrow::util::Codec;
4449
You can’t perform that action at this time.
0 commit comments