From 8fb596221ff4632b5b9fa5af390ad19f2ea71321 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 22 Oct 2014 12:39:43 +0200 Subject: [PATCH] + fixes #0001794: new defined as a macro sometimes conflicts with boost --- src/App/Application.cpp | 4 ---- src/App/ApplicationPy.cpp | 1 - src/App/Document.cpp | 4 ---- src/App/DocumentObject.cpp | 2 +- src/App/FeatureTest.cpp | 1 - src/App/GeoFeature.cpp | 2 +- src/App/PropertyStandard.cpp | 2 +- src/App/PropertyUnits.cpp | 1 - src/Base/XMLTools.cpp | 2 -- src/FCConfig.h | 19 ------------------- src/Gui/View3DInventorRiftViewer.cpp | 2 -- src/Gui/View3DInventorViewer.cpp | 2 -- .../templateClassPyExport.py | 2 -- 13 files changed, 3 insertions(+), 41 deletions(-) diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 0cdeba513..ab2439de8 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -129,10 +129,6 @@ using namespace boost::program_options; # include #endif -#ifdef MemDebugOn -# define new DEBUG_CLIENTBLOCK -#endif - //using Base::GetConsole; using namespace Base; diff --git a/src/App/ApplicationPy.cpp b/src/App/ApplicationPy.cpp index 000a3c440..cda2a80fd 100644 --- a/src/App/ApplicationPy.cpp +++ b/src/App/ApplicationPy.cpp @@ -45,7 +45,6 @@ #include #include -#define new DEBUG_CLIENTBLOCK //using Base::GetConsole; using namespace Base; using namespace App; diff --git a/src/App/Document.cpp b/src/App/Document.cpp index a53b96d6b..d4fcc2b54 100644 --- a/src/App/Document.cpp +++ b/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 diff --git a/src/App/DocumentObject.cpp b/src/App/DocumentObject.cpp index 0804a5a99..07d1cc326 100644 --- a/src/App/DocumentObject.cpp +++ b/src/App/DocumentObject.cpp @@ -33,7 +33,7 @@ #include "DocumentObjectPy.h" #include "DocumentObjectGroup.h" #include "PropertyLinks.h" -#define new DEBUG_CLIENTBLOCK + using namespace App; diff --git a/src/App/FeatureTest.cpp b/src/App/FeatureTest.cpp index 895c543c7..00f1d3dae 100644 --- a/src/App/FeatureTest.cpp +++ b/src/App/FeatureTest.cpp @@ -38,7 +38,6 @@ #pragma warning( disable : 4723 ) #endif -#define new DEBUG_CLIENTBLOCK using namespace App; diff --git a/src/App/GeoFeature.cpp b/src/App/GeoFeature.cpp index b85799cd8..9c92f7d35 100644 --- a/src/App/GeoFeature.cpp +++ b/src/App/GeoFeature.cpp @@ -27,7 +27,7 @@ #endif #include "GeoFeature.h" -#define new DEBUG_CLIENTBLOCK + using namespace App; diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index a463107d3..b10418f69 100644 --- a/src/App/PropertyStandard.cpp +++ b/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; diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index 7a7d05bd3..8f5220cb4 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -40,7 +40,6 @@ #include #include -#define new DEBUG_CLIENTBLOCK using namespace App; using namespace Base; using namespace std; diff --git a/src/Base/XMLTools.cpp b/src/Base/XMLTools.cpp index d16a1bab4..5c0ec9b6a 100644 --- a/src/Base/XMLTools.cpp +++ b/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 StrXUTF8::transcoder; diff --git a/src/FCConfig.h b/src/FCConfig.h index 330d87b26..449425ee0 100644 --- a/src/FCConfig.h +++ b/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 //************************************************************************** diff --git a/src/Gui/View3DInventorRiftViewer.cpp b/src/Gui/View3DInventorRiftViewer.cpp index 5d8613411..705c5e00b 100644 --- a/src/Gui/View3DInventorRiftViewer.cpp +++ b/src/Gui/View3DInventorRiftViewer.cpp @@ -30,8 +30,6 @@ #include "View3DInventorRiftViewer.h" #include -#define new DEBUG_CLIENTBLOCK - using namespace Gui; View3DInventorRiftViewer::View3DInventorRiftViewer() : CoinRiftWidget() diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 4410d2306..d96dce0df 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -126,8 +126,6 @@ //#define FC_LOGGING_CB -#define new DEBUG_CLIENTBLOCK - using namespace Gui; /*** zoom-style cursor ******/ diff --git a/src/Tools/generateTemplates/templateClassPyExport.py b/src/Tools/generateTemplates/templateClassPyExport.py index 380f942c1..3bc5c7b44 100644 --- a/src/Tools/generateTemplates/templateClassPyExport.py +++ b/src/Tools/generateTemplates/templateClassPyExport.py @@ -238,8 +238,6 @@ public: #include #include -#define new DEBUG_CLIENTBLOCK - using Base::streq; using namespace @self.export.Namespace@;