From 227aafd1d93d23c3f85564c94f03e91a0fff8fa0 Mon Sep 17 00:00:00 2001 From: Howard Huang Date: Fri, 10 Sep 2021 11:48:43 -0700 Subject: [PATCH] Revert D30846958: [caffe2/aten] Remove loose #pragma warning ( pop ) in TensorBase.h Test Plan: revert-hammer Differential Revision: D30846958 (https://github.com/pytorch/pytorch/commit/40098f48a1a37a06a456fd642d908ca522295706) Original commit changeset: 52a3fb66e426 fbshipit-source-id: 1d749f6981756f2169d6867538555a945cbb8ca6 --- 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