diff --git a/Eigen/src/Core/util/DisableStupidWarnings.h b/Eigen/src/Core/util/DisableStupidWarnings.h
index 4501d3248..76ae1c9bd 100755
--- a/Eigen/src/Core/util/DisableStupidWarnings.h
+++ b/Eigen/src/Core/util/DisableStupidWarnings.h
@@ -56,7 +56,7 @@
     #pragma GCC diagnostic push
   #endif
   // g++ warns about local variables shadowing member functions, which is too strict
-  #pragma GCC diagnostic ignored "-Wshadow"
+//  #pragma GCC diagnostic ignored "-Wshadow"
   #if __GNUC__ == 4 && __GNUC_MINOR__ < 8
     // Until g++-4.7 there are warnings when comparing unsigned int vs 0, even in templated functions:
     #pragma GCC diagnostic ignored "-Wtype-limits"
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h
index 6b1a6ba85..ba3a80f97 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h
@@ -679,10 +679,10 @@ struct TensorEvaluator<const TensorContractionOp<Indices, LeftArgType, RightArgT
 
       // Reuse pre-allocated thread local buffers.
       BlockType* thread_local_pre_allocated_base_ = nullptr;
-      size_t grain_size_;
+      size_t grain_size_ = 0;
 
       // These will be initialized only if `is_pre_allocated == false`.
-      BlockMemHandle mem_handle_;
+      BlockMemHandle mem_handle_{};
       std::vector<BlockType> blocks_;
     };