Changed: Added more memory leaks checks

--HG--
branch : develop
This commit is contained in:
kervala 2017-10-01 15:08:31 +02:00
parent 64c90c4fdc
commit 2fad59f296
105 changed files with 447 additions and 5 deletions

View file

@ -32,6 +32,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -480,12 +480,21 @@ public:
virtual ~CStateRecord() {} virtual ~CStateRecord() {}
// use STL allocator for fast alloc. this works because objects are small ( < 128 bytes) // use STL allocator for fast alloc. this works because objects are small ( < 128 bytes)
void *operator new(size_t size) { return CStateRecord::Allocator.allocate(size); } void *operator new(size_t size) { return CStateRecord::Allocator.allocate(size); }
void *operator new(size_t size, int /* blockUse */, char const * /* fileName */, int /* lineNumber */)
{
// TODO: add memory leaks detector
return CStateRecord::Allocator.allocate(size);
}
void operator delete(void *block) { CStateRecord::Allocator.deallocate((uint8 *) block, 1); } void operator delete(void *block) { CStateRecord::Allocator.deallocate((uint8 *) block, 1); }
void operator delete(void *block, int /* blockUse */, char const* /* fileName */, int /* lineNumber */)
{
// TODO: add memory leaks detector
CStateRecord::Allocator.deallocate((uint8 *)block, 1);
}
static std::allocator<uint8> Allocator; static std::allocator<uint8> Allocator;
}; };
// record of a single .fx pass // record of a single .fx pass
class CFXPassRecord class CFXPassRecord
{ {

View file

@ -25,6 +25,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -17,6 +17,10 @@
#include "stddirect3d.h" #include "stddirect3d.h"
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -26,6 +26,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -27,6 +27,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -26,6 +26,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -29,6 +29,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -19,6 +19,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -27,6 +27,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -20,6 +20,10 @@
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -26,6 +26,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -18,6 +18,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -26,6 +26,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -18,6 +18,10 @@
#include "driver_direct3d.h" #include "driver_direct3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -24,6 +24,10 @@
#include "nel/georges/form.h" #include "nel/georges/form.h"
#include "nel/georges/form_loader.h" #include "nel/georges/form_loader.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace NLGEORGES namespace NLGEORGES

View file

@ -24,6 +24,10 @@
#include "nel/georges/form_loader.h" #include "nel/georges/form_loader.h"
#include "nel/georges/form_elm.h" #include "nel/georges/form_elm.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -25,6 +25,10 @@
#include "nel/georges/form_loader.h" #include "nel/georges/form_loader.h"
#include "nel/georges/type.h" #include "nel/georges/type.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -27,6 +27,10 @@
#include "nel/georges/form.h" #include "nel/georges/form.h"
#include "nel/georges/form_dfn.h" #include "nel/georges/form_dfn.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -22,6 +22,10 @@
#include "nel/georges/header.h" #include "nel/georges/header.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace NLGEORGES namespace NLGEORGES

View file

@ -14,6 +14,16 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef STDGEORGES_H
#define STDGEORGES_H
#if defined(_MSC_VER) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#endif
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include <cmath> #include <cmath>
#include <list> #include <list>
@ -27,3 +37,5 @@
// Include from libxml2 // Include from libxml2
#include <libxml/parser.h> #include <libxml/parser.h>
#endif

View file

@ -27,6 +27,10 @@
#include "nel/georges/form_loader.h" #include "nel/georges/form_loader.h"
#include "nel/georges/type.h" #include "nel/georges/type.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -23,6 +23,10 @@
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -18,6 +18,9 @@
#include "listener_dsound.h" #include "listener_dsound.h"
#include "sound_driver_dsound.h" #include "sound_driver_dsound.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -31,6 +31,9 @@
#include "sound_driver_dsound.h" #include "sound_driver_dsound.h"
#include "listener_dsound.h" #include "listener_dsound.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,9 @@
#include "buffer_dsound.h" #include "buffer_dsound.h"
#include "listener_dsound.h" #include "listener_dsound.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -14,6 +14,16 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef STDDSOUND_H
#define STDDSOUND_H
#if defined(_MSC_VER) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#endif
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#define EAX_AVAILABLE 0 #define EAX_AVAILABLE 0
@ -44,4 +54,5 @@
#include "nel/sound/driver/source.h" #include "nel/sound/driver/source.h"
#include "nel/sound/driver/listener.h" #include "nel/sound/driver/listener.h"
#endif
/* end of file */ /* end of file */

View file

@ -25,6 +25,10 @@
# include <mmsystem.h> # include <mmsystem.h>
#endif #endif
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -18,6 +18,9 @@
#include "listener_fmod.h" #include "listener_fmod.h"
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -18,6 +18,10 @@
#include "music_channel_fmod.h" #include "music_channel_fmod.h"
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -26,6 +26,10 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,9 @@
#include "buffer_fmod.h" #include "buffer_fmod.h"
#include "listener_fmod.h" #include "listener_fmod.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -14,6 +14,16 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef STDFMOD_H
#define STDFMOD_H
#if defined(_MSC_VER) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#endif
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
@ -42,4 +52,6 @@
#include "nel/sound/driver/source.h" #include "nel/sound/driver/source.h"
#include "nel/sound/driver/listener.h" #include "nel/sound/driver/listener.h"
#endif
/* end of file */ /* end of file */

View file

@ -18,6 +18,10 @@
#include "sound_driver_al.h" #include "sound_driver_al.h"
#include "buffer_al.h" #include "buffer_al.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace NLSOUND namespace NLSOUND

View file

@ -19,6 +19,10 @@
#include "effect_al.h" #include "effect_al.h"
#include "sound_driver_al.h" #include "sound_driver_al.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
// using namespace NLMISC; // using namespace NLMISC;

View file

@ -18,6 +18,10 @@
#include "listener_al.h" #include "listener_al.h"
#include "sound_driver_al.h" #include "sound_driver_al.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace NLSOUND { namespace NLSOUND {

View file

@ -22,6 +22,10 @@
#include "ext_al.h" #include "ext_al.h"
#include "effect_al.h" #include "effect_al.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -22,6 +22,10 @@
#include "source_al.h" #include "source_al.h"
#include "ext_al.h" #include "ext_al.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
// #define NLSOUND_DEBUG_GAIN // #define NLSOUND_DEBUG_GAIN
using namespace std; using namespace std;

View file

@ -20,6 +20,10 @@
#include "buffer_xaudio2.h" #include "buffer_xaudio2.h"
#include "adpcm_xaudio2.h" #include "adpcm_xaudio2.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
// using namespace NLMISC; // using namespace NLMISC;

View file

@ -20,6 +20,10 @@
#include "buffer_xaudio2.h" #include "buffer_xaudio2.h"
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,10 @@
#include "listener_xaudio2.h" #include "listener_xaudio2.h"
#include "effect_xaudio2.h" #include "effect_xaudio2.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -20,6 +20,10 @@
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
#include "listener_xaudio2.h" #include "listener_xaudio2.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -22,6 +22,10 @@
#include "effect_xaudio2.h" #include "effect_xaudio2.h"
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -26,6 +26,10 @@
#include "effect_xaudio2.h" #include "effect_xaudio2.h"
#include "source_xaudio2.h" #include "source_xaudio2.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -22,6 +22,10 @@
#include "events_listener.h" #include "events_listener.h"
#include "interface_v3/interface_manager.h" #include "interface_v3/interface_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

View file

@ -28,6 +28,9 @@
#include "actions_client.h" #include "actions_client.h"
#include "interface_v3/input_handler_manager.h" #include "interface_v3/input_handler_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
/////////// ///////////
// USING // // USING //

View file

@ -35,6 +35,9 @@
#include "client_cfg.h" #include "client_cfg.h"
#include "entity_animation_manager.h" // \todo GUIGUI : added to recompile animations at loading (to do better ?). #include "entity_animation_manager.h" // \todo GUIGUI : added to recompile animations at loading (to do better ?).
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
/////////// ///////////
// USING // // USING //

View file

@ -27,6 +27,10 @@
#include "nel/3d/u_scene.h" #include "nel/3d/u_scene.h"
#include "client_sheets/animation_fx_set_sheet.h" #include "client_sheets/animation_fx_set_sheet.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
extern NL3D::UScene *Scene; extern NL3D::UScene *Scene;

View file

@ -23,6 +23,10 @@
// //
#include "nel/3d/u_scene.h" #include "nel/3d/u_scene.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
extern NL3D::UScene *Scene; extern NL3D::UScene *Scene;
// ********************************************************************* // *********************************************************************

View file

@ -20,4 +20,8 @@
#include "animation_fx_misc.h" #include "animation_fx_misc.h"
#include "animation_fx_id_array.h" #include "animation_fx_id_array.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
CAnimationFXIDArray AnimFXMisc; CAnimationFXIDArray AnimFXMisc;

View file

@ -27,6 +27,9 @@
// 3d // 3d
#include "nel/3d/u_track.h" #include "nel/3d/u_track.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
/////////// ///////////
// USING // // USING //

View file

@ -33,6 +33,10 @@
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"
#include "nel/georges/u_form_loader.h" #include "nel/georges/u_form_loader.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
/////////// ///////////
// USING // // USING //
/////////// ///////////

View file

@ -30,6 +30,10 @@
// Georges // Georges
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
/////////// ///////////
// USING // // USING //
/////////// ///////////

View file

@ -21,6 +21,10 @@
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#endif #endif
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
std::string getAppBundlePath() std::string getAppBundlePath()
{ {
static std::string s_cachedPathToBundle; static std::string s_cachedPathToBundle;

View file

@ -27,6 +27,10 @@
#include "time_client.h" #include "time_client.h"
#include "fx_manager.h" #include "fx_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
extern NL3D::UScene *Scene; extern NL3D::UScene *Scene;

View file

@ -29,6 +29,9 @@
// //
#include <utility> #include <utility>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
H_AUTO_DECL(RZ_AttackList) H_AUTO_DECL(RZ_AttackList)

View file

@ -33,6 +33,9 @@
#include <string> #include <string>
#include <fstream> #include <fstream>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
/////////// ///////////
// USING // // USING //

View file

@ -19,6 +19,10 @@
#include "stdpch.h" #include "stdpch.h"
#include "behaviour_context.h" #include "behaviour_context.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
CBehaviourContext::CBehaviourContext() CBehaviourContext::CBehaviourContext()
{ {
} }

View file

@ -31,6 +31,10 @@
#include "nel/misc/win_thread.h" #include "nel/misc/win_thread.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace BGDownloader; using namespace BGDownloader;
using namespace NLMISC; using namespace NLMISC;

View file

@ -17,6 +17,10 @@
#include "stdpch.h" #include "stdpch.h"
#include "browse_faq.h" #include "browse_faq.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
void browseFAQ(NLMISC::CConfigFile &cf) void browseFAQ(NLMISC::CConfigFile &cf)

View file

@ -22,6 +22,10 @@
#include "global.h" #include "global.h"
#include "misc.h" #include "misc.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;

View file

@ -111,6 +111,9 @@
#include "game_share/range_weapon_type.h" #include "game_share/range_weapon_type.h"
// //
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
//////////// ////////////
// DEFINE // // DEFINE //
@ -137,10 +140,6 @@ using namespace std;
using namespace MBEHAV; using namespace MBEHAV;
using namespace CLFECOMMON; using namespace CLFECOMMON;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
//////////// ////////////
// EXTERN // // EXTERN //
//////////// ////////////

View file

@ -107,6 +107,9 @@
// to desactive some commands // to desactive some commands
// //
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
//////////////// ////////////////

View file

@ -26,6 +26,10 @@ using namespace NLMISC;
using namespace NLNET; using namespace NLNET;
using namespace std; using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
#define _Curl (CURL *)_CurlStruct #define _Curl (CURL *)_CurlStruct

View file

@ -21,6 +21,10 @@
// //
#include "nel/misc/i18n.h" #include "nel/misc/i18n.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -17,6 +17,9 @@
#include "stdpch.h" #include "stdpch.h"
#include "config_var.h" #include "config_var.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2

View file

@ -23,6 +23,10 @@
#include "nel/gui/lua_ihm.h" #include "nel/gui/lua_ihm.h"
#include "nel/gui/interface_element.h" #include "nel/gui/interface_element.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2
{ {

View file

@ -20,6 +20,10 @@
#include "../interface_v3/lua_ihm_ryzom.h" #include "../interface_v3/lua_ihm_ryzom.h"
#include "editor.h" #include "editor.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2
{ {

View file

@ -33,6 +33,10 @@
// //
#include "r2_config.h" #include "r2_config.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
extern uint SkipFrame; extern uint SkipFrame;

View file

@ -23,6 +23,9 @@
#include "../interface_v3/interface_manager.h" #include "../interface_v3/interface_manager.h"
#include "nel/gui/view_renderer.h" #include "nel/gui/view_renderer.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -58,6 +58,10 @@
// //
#include "../sheet_manager.h" #include "../sheet_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;

View file

@ -38,6 +38,10 @@
#include "../time_client.h" #include "../time_client.h"
// //
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
class CGroupMap; class CGroupMap;
using namespace R2; using namespace R2;

View file

@ -22,6 +22,9 @@
#include "../global.h" #include "../global.h"
// //
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;

View file

@ -33,6 +33,9 @@
#include "nel/3d/u_visual_collision_manager.h" #include "nel/3d/u_visual_collision_manager.h"
#include "nel/3d/u_visual_collision_entity.h" #include "nel/3d/u_visual_collision_entity.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,10 @@
#include "../editor.h" #include "../editor.h"
#include "nel/gui/lua_ihm.h" #include "nel/gui/lua_ihm.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2
{ {

View file

@ -68,6 +68,9 @@
#include <zlib.h> #include <zlib.h>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std; using namespace std;

View file

@ -58,6 +58,9 @@ using namespace NLGUI;
using namespace NLMISC; using namespace NLMISC;
using namespace R2; using namespace R2;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
std::map<lua_State*, CComLuaModule*> CComLuaModule::_Instance; std::map<lua_State*, CComLuaModule*> CComLuaModule::_Instance;

View file

@ -45,6 +45,9 @@
#include <assert.h> #include <assert.h>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLNET; using namespace NLNET;
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,10 @@
#include <assert.h> #include <assert.h>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace R2; using namespace R2;
namespace R2 namespace R2

View file

@ -21,6 +21,11 @@
#include "game_share/object.h" #include "game_share/object.h"
#include <assert.h> #include <assert.h>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace R2; using namespace R2;

View file

@ -115,6 +115,9 @@ using namespace NLGUI;
#include "../far_tp.h" #include "../far_tp.h"
#include "nel/gui/lua_manager.h" #include "nel/gui/lua_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace NLNET; using namespace NLNET;
@ -1628,8 +1631,17 @@ int CEditor::luaEnumInstances(CLuaState &ls)
mt.setValue("__gc", CLuaObject(ls)); mt.setValue("__gc", CLuaObject(ls));
// //
void *newIter = ls.newUserData(sizeof(CInstanceEnumerator)); void *newIter = ls.newUserData(sizeof(CInstanceEnumerator));
#ifdef new
#undef new
#endif
CInstanceEnumerator *ie = new (newIter) CInstanceEnumerator; CInstanceEnumerator *ie = new (newIter) CInstanceEnumerator;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
ie->InstMap = &getEditor()._InstancesByDispName[classIndex]; ie->InstMap = &getEditor()._InstancesByDispName[classIndex];
ie->Current = ie->InstMap->begin(); ie->Current = ie->InstMap->begin();
mt.push(); mt.push();

View file

@ -21,6 +21,10 @@
// //
#include "nel/misc/vector.h" #include "nel/misc/vector.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace R2 namespace R2

View file

@ -20,6 +20,10 @@
#include "../user_entity.h" #include "../user_entity.h"
#include "../time_client.h" #include "../time_client.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace R2 namespace R2

View file

@ -30,6 +30,9 @@
// //
#include "displayer_visual_entity.h" #include "displayer_visual_entity.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -33,6 +33,10 @@
// //
#include "nel/3d/texture_file.h" #include "nel/3d/texture_file.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
extern CContinentManager ContinentMngr; extern CContinentManager ContinentMngr;
using namespace NL3D; using namespace NL3D;

View file

@ -18,6 +18,9 @@
#include "lua_event_forwarder.h" #include "lua_event_forwarder.h"
#include "nel/gui/lua_object.h" #include "nel/gui/lua_object.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2
{ {

View file

@ -21,6 +21,9 @@
#include "../global.h" #include "../global.h"
#include "../misc.h" #include "../misc.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;

View file

@ -27,6 +27,10 @@
#include "../sheet_manager.h" #include "../sheet_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;
using namespace std; using namespace std;

View file

@ -21,6 +21,10 @@
#include "nel/gui/lua_ihm.h" #include "nel/gui/lua_ihm.h"
#include "../interface_v3/lua_ihm_ryzom.h" #include "../interface_v3/lua_ihm_ryzom.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2
{ {
@ -319,7 +323,17 @@ void CObjectTableClient::pushOnLuaStack(CLuaState &state, CLuaObject &metatable)
nlassert(metatable.isValid()); nlassert(metatable.isValid());
// return a new refptr on the sub table // return a new refptr on the sub table
void *block = state.newUserData(sizeof(TRefPtrConst)); void *block = state.newUserData(sizeof(TRefPtrConst));
#ifdef new
#undef new
#endif
new (block) CObjectTable::TRefPtrConst(this); // create in place new (block) CObjectTable::TRefPtrConst(this); // create in place
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
metatable.push(); metatable.push();
state.setMetaTable(-2); state.setMetaTable(-2);
_Ref.pop(state); _Ref.pop(state);

View file

@ -18,6 +18,9 @@
#include "palette_node.h" #include "palette_node.h"
#include "editor.h" #include "editor.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2

View file

@ -29,6 +29,9 @@
#include "nel/gui/view_renderer.h" #include "nel/gui/view_renderer.h"
#include "../interface_v3/group_map.h" #include "../interface_v3/group_map.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NL3D; using namespace NL3D;
using namespace NLMISC; using namespace NLMISC;

View file

@ -17,6 +17,9 @@
#include "stdpch.h" #include "stdpch.h"
#include "r2_config.h" #include "r2_config.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,10 @@
#include "stdpch.h" #include "stdpch.h"
#include "r2_lua.h" #include "r2_lua.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
// stupid function to remove VC6 warnings // stupid function to remove VC6 warnings
#ifdef NL_COMP_VC6 #ifdef NL_COMP_VC6
void foo_r2_lua_cpp() {} void foo_r2_lua_cpp() {}

View file

@ -42,6 +42,10 @@
// //
#include "nel/3d/packed_world.h" #include "nel/3d/packed_world.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
extern NLPACS::UGlobalRetriever *GR; extern NLPACS::UGlobalRetriever *GR;

View file

@ -35,6 +35,10 @@
#include "dmc/idmc.h" #include "dmc/idmc.h"
#include "r2_config.h" #include "r2_config.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLPACS; using namespace NLPACS;
using namespace NLMISC; using namespace NLMISC;

View file

@ -21,6 +21,10 @@
// //
#include "nel/misc/vectord.h" #include "nel/misc/vectord.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLPACS; using namespace NLPACS;
using namespace NLMISC; using namespace NLMISC;

View file

@ -41,6 +41,10 @@
#include "game_share/player_visual_properties.h" #include "game_share/player_visual_properties.h"
#include "game_share/visual_slot_manager.h" #include "game_share/visual_slot_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLPACS; using namespace NLPACS;
using namespace NLMISC; using namespace NLMISC;
using namespace std; using namespace std;

View file

@ -34,6 +34,9 @@
// tmp tmp // tmp tmp
#include "nel/gui/ctrl_quad.h" #include "nel/gui/ctrl_quad.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;

View file

@ -20,6 +20,10 @@
#include "editor.h" #include "editor.h"
#include "../interface_v3/interface_manager.h" #include "../interface_v3/interface_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace R2 namespace R2
{ {

View file

@ -23,6 +23,10 @@
// //
#include "nel/misc/i18n.h" #include "nel/misc/i18n.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace NLMISC; using namespace NLMISC;
namespace R2 namespace R2

Some files were not shown because too many files have changed in this diff Show more