+ fixes #0001794: new defined as a macro sometimes conflicts with boost

src/App/Application.cpp

@@ -129,10 +129,6 @@ using namespace boost::program_options;
 # include <new>
 #endif
 
-#ifdef MemDebugOn
-# define new DEBUG_CLIENTBLOCK
-#endif
-
 
 //using Base::GetConsole;
 using namespace Base;

src/App/ApplicationPy.cpp

@@ -45,7 +45,6 @@
 #include <Base/FileInfo.h>
 #include <Base/UnitsApi.h>
 
-#define new DEBUG_CLIENTBLOCK
 //using Base::GetConsole;
 using namespace Base;
 using namespace App;

src/App/Document.cpp

@@ -105,10 +105,6 @@ using namespace std;
 using namespace boost;
 using namespace zipios;
 
-#ifdef MemDebugOn
-# define new DEBUG_CLIENTBLOCK
-#endif
-
 #if FC_DEBUG
 #  define FC_LOGFEATUREUPDATE
 #endif 

src/App/DocumentObject.cpp

@@ -33,7 +33,7 @@
 #include "DocumentObjectPy.h"
 #include "DocumentObjectGroup.h"
 #include "PropertyLinks.h"
-#define new DEBUG_CLIENTBLOCK
+
 using namespace App;
 
 

src/App/FeatureTest.cpp

@@ -38,7 +38,6 @@
 #pragma warning( disable : 4723 )
 #endif
 
-#define new DEBUG_CLIENTBLOCK
 using namespace App;
 
 

src/App/GeoFeature.cpp

@@ -27,7 +27,7 @@
 #endif
 
 #include "GeoFeature.h"
-#define new DEBUG_CLIENTBLOCK
+
 using namespace App;
 
 

src/App/PropertyStandard.cpp

@@ -38,7 +38,7 @@
 
 #include "PropertyStandard.h"
 #include "MaterialPy.h"
-#define new DEBUG_CLIENTBLOCK
+
 using namespace App;
 using namespace Base;
 using namespace std;

src/App/PropertyUnits.cpp

@@ -40,7 +40,6 @@
 #include <Base/PyObjectBase.h>
 #include <Base/QuantityPy.h>
 
-#define new DEBUG_CLIENTBLOCK
 using namespace App;
 using namespace Base;
 using namespace std;

src/Base/XMLTools.cpp

@@ -30,8 +30,6 @@
 /// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "XMLTools.h"
 
-#define new DEBUG_CLIENTBLOCK
-
 using namespace Base;
 
 std::auto_ptr<XERCES_CPP_NAMESPACE::XMLTranscoder> StrXUTF8::transcoder;

src/FCConfig.h

@@ -172,25 +172,6 @@ typedef unsigned __int64    uint64_t;
 
 #endif
 
-//**************************************************************************
-// Crt Memory debugging
-
-/** Memory Crt debugging on
-  * This switches the debug CRT on Windows on. This is mostly located in
-  * MemDebug.cpp and .h in src/Base. With this on a file (MemLog.txt) is 
-  * written on exit which reports e.g. unfreed memory.
-  */
-#if defined(_DEBUG) && defined(_MSC_VER)
-//# define MemDebugOn
-#endif
-
-#if defined(MemDebugOn) && defined(FC_OS_WIN32)
-# define DEBUG_CLIENTBLOCK   new( _CLIENT_BLOCK, __FILE__, __LINE__)
-#else
-# define DEBUG_CLIENTBLOCK   new
-#endif // MemDebugOn
-
-
 
 //FIXME: Move to modules where OCC is needed
 //**************************************************************************

src/Gui/View3DInventorRiftViewer.cpp

@@ -30,8 +30,6 @@
 #include "View3DInventorRiftViewer.h"
 #include <App/Application.h>
 
-#define new DEBUG_CLIENTBLOCK
-
 using namespace Gui;
 
 View3DInventorRiftViewer::View3DInventorRiftViewer() : CoinRiftWidget()

src/Gui/View3DInventorViewer.cpp

@@ -126,8 +126,6 @@
 
 //#define FC_LOGGING_CB
 
-#define new DEBUG_CLIENTBLOCK
-
 using namespace Gui;
 
 /*** zoom-style cursor ******/

src/Tools/generateTemplates/templateClassPyExport.py

@@ -238,8 +238,6 @@ public:
 #include <Base/Exception.h>
 #include <CXX/Objects.hxx>
 
-#define new DEBUG_CLIENTBLOCK
-
 using Base::streq;
 using namespace @self.export.Namespace@;