Merge pull request #18632 from mantidproject/Remove_old_c4250_warning_suppression

Remove c4250 warning suppression on MSVC

Framework/DataHandling/src/GenerateGroupingPowder.cpp

@@ -6,28 +6,15 @@
 #include "MantidGeometry/Crystal/AngleUnits.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/System.h"
 
 #include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/DOMWriter.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/Text.h>
-
-#ifdef _MSC_VER
-// Disable a flood of warnings from Poco about inheriting from
-// std::basic_istream
-// See
-// http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 #include <Poco/XML/XMLWriter.h>
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #include <fstream>
 
 using namespace Mantid::Kernel;

Framework/DataHandling/src/SaveMask.cpp

@@ -7,9 +7,9 @@
 
 #include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/Document.h>
+#include <Poco/DOM/DOMWriter.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/Text.h>
-#include <Poco/DOM/DOMWriter.h>
 #include <Poco/XML/XMLWriter.h>
 
 #include <algorithm>

Framework/Geometry/inc/MantidGeometry/Instrument/Component.h

@@ -3,21 +3,10 @@
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Instrument/ParameterMap.h"
+
 #include <string>
 #include <typeinfo>
 #include <vector>
-#ifdef _MSC_VER
-// Disable a flood of warnings from Poco about inheriting from
-// std::basic_istream
-// See
-// http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 namespace Poco {
 namespace XML {

Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp

-#include <fstream>
-#include <sstream>
-
 #include "MantidGeometry/Rendering/vtkGeometryCacheWriter.h"
+
 #include "MantidGeometry/Objects/Object.h"
 #include "MantidGeometry/Rendering/GeometryHandler.h"
 #include "MantidKernel/Logger.h"
@@ -11,23 +9,13 @@
 #include <Poco/DOM/DOMWriter.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/Text.h>
-
-#ifdef _MSC_VER
-// Disable a flood of warnings from Poco about inheriting from
-// std::basic_istream
-// See
-// http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
+#include <Poco/File.h>
 #include <Poco/FileStream.h>
+#include <Poco/Path.h>
 #include <Poco/XML/XMLWriter.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
-#include <Poco/File.h>
-#include <Poco/Path.h>
+#include <fstream>
+#include <sstream>
 
 using Poco::XML::Document;
 using Poco::XML::Element;

Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h

@@ -5,25 +5,16 @@
 // Includes
 //--------------------------------------------
 #include "MantidKernel/DllConfig.h"
-#include <Poco/Logger.h>
-
-#ifdef _MSC_VER
-// Disable a flood of warnings about inheriting from std streams
-// See
-// http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
 
+#include <Poco/Logger.h>
 #include <Poco/LogStream.h>
+#include <Poco/Thread.h>
 #include <Poco/UnbufferedStreamBuf.h>
 
 #include <istream>
-#include <Poco/Thread.h>
 #include <mutex>
 
 namespace Mantid {
-
 namespace Kernel {
 /**
 
@@ -166,8 +157,4 @@ public:
 }
 }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #endif // MANTID_KERNEL_THREADSAFELOGSTREAM

Framework/Kernel/src/Logger.cpp

 #include "MantidKernel/Logger.h"
-#include "MantidKernel/ThreadSafeLogStream.h"
 
-#ifdef _MSC_VER
-// Disable a flood of warnings about inheriting from std streams
-// See
-// http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
+#include "MantidKernel/ThreadSafeLogStream.h"
 
 #include <Poco/NullStream.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <iostream>
 #include <sstream>

MantidQt/CustomInterfaces/src/Muon/IO_MuonGrouping.cpp

 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include <fstream>
-
 #include "MantidQtCustomInterfaces/Muon/IO_MuonGrouping.h"
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidQtAPI/UserSubWindow.h"
 
-#include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
-
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/DOMWriter.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/DOM/Text.h>
-
-#ifdef _MSC_VER
-// Disable a flood of warnings from Poco about inheriting from
-// std::basic_istream
-// See
-// http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
-#pragma warning(push)
-#pragma warning(disable : 4250)
 #include <Poco/XML/XMLWriter.h>
-#pragma warning(pop)
-#else
-#include <Poco/XML/XMLWriter.h>
-#endif
+
+#include <boost/shared_ptr.hpp>
+#include <boost/bind.hpp>
+#include <fstream>
 
 //-----------------------------------------------------------------------------
 using namespace Mantid;