From c96f61b0a1e3ab15cc2cb198fdbe58ce4a5d8c59 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 6 Mar 2022 03:25:14 +0100 Subject: [PATCH] [App] next attempt to fix CI build error - revert previous commit and re-add application as header --- src/App/AutoTransaction.cpp | 12 +----------- src/Gui/ViewProviderPythonFeature.h | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/App/AutoTransaction.cpp b/src/App/AutoTransaction.cpp index 203a1fc9b5..054b6e8f61 100644 --- a/src/App/AutoTransaction.cpp +++ b/src/App/AutoTransaction.cpp @@ -30,18 +30,13 @@ #include "Transactions.h" -FC_LOG_LEVEL_INIT("App",true,true) +FC_LOG_LEVEL_INIT("App", true, true) using namespace App; static int _TransactionLock; static int _TransactionClosed; -void* App::AutoTransaction::operator new(size_t size) -{ - return nullptr; -} - AutoTransaction::AutoTransaction(const char *name, bool tmpName) { auto &app = GetApplication(); if(name && app._activeTransactionGuard>=0) { @@ -245,8 +240,3 @@ bool TransactionLocker::isLocked() { return _TransactionLock > 0; } -void* App::TransactionLocker::operator new(size_t size) -{ - return nullptr; -} - diff --git a/src/Gui/ViewProviderPythonFeature.h b/src/Gui/ViewProviderPythonFeature.h index e04f737d5d..f77f53bc38 100644 --- a/src/Gui/ViewProviderPythonFeature.h +++ b/src/Gui/ViewProviderPythonFeature.h @@ -23,6 +23,7 @@ #ifndef GUI_VIEWPROVIDERPYTHONFEATURE_H #define GUI_VIEWPROVIDERPYTHONFEATURE_H +#include #include #include #include