From dd2d48df07d6b9354f3e448bf66655941a22d1e1 Mon Sep 17 00:00:00 2001 From: Natalia Gimelshein Date: Sat, 11 Sep 2021 17:17:00 -0700 Subject: [PATCH] Revert D30875977: [caffe2] [aten] Remove loose (unpaired) #pragma warning ( pop ) in TensorBase.h Test Plan: revert-hammer Differential Revision: D30875977 (https://github.com/pytorch/pytorch/commit/1f35d20a894bb07e27691332af4beb097142762f) Original commit changeset: bd593feb5a75 fbshipit-source-id: 4c82dbc857fdb28e0240dacc1a0e607a76552bb4 --- aten/src/ATen/core/TensorBase.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aten/src/ATen/core/TensorBase.h b/aten/src/ATen/core/TensorBase.h index 352aef9..e91e9e1 100644 --- a/aten/src/ATen/core/TensorBase.h +++ b/aten/src/ATen/core/TensorBase.h @@ -755,6 +755,12 @@ private: TensorBase __dispatch_contiguous(c10::MemoryFormat) const; }; +// For "multiple ... operators specified" warnings, closing brace of class +// declaration must be included between pragma push & pop +#ifdef _MSC_VER +#pragma warning( pop ) +#endif + inline int64_t get_device(const TensorBase& self) { return self.get_device(); } -- 2.7.4