mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8079] Fixed build errors at use old ACE versions (without ace/Stack_Trace.h).

Browse source
This commit is contained in:
VladimirMangos 2009-06-26 23:23:26 +04:00 • committed by tomrus88
parent fc5dde85c4
commit 0a8f9ac6e9
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -228,6 +228,8 @@ fi
AM_CONDITIONAL([MANGOS_BUILD_ACE], [test X$need_to_build_ace = Xyes]) AM_CONDITIONAL([MANGOS_BUILD_ACE], [test X$need_to_build_ace = Xyes])
# old ace versions not have ace/Stack_Trace.h
AC_CHECK_HEADERS([ace/Stack_Trace.h])
## Unify all additional includes/libs in one variable. ## Unify all additional includes/libs in one variable.
# TODO this looks kinda ugly, but when we add m4 folder I will make it look very pritey ( by Derex ). # TODO this looks kinda ugly, but when we add m4 folder I will make it look very pritey ( by Derex ).

14
src/shared/Errors.h
View file

@ -19,9 +19,21 @@
#ifndef MANGOSSERVER_ERRORS_H #ifndef MANGOSSERVER_ERRORS_H
#define MANGOSSERVER_ERRORS_H #define MANGOSSERVER_ERRORS_H
#include "ace/Stack_Trace.h" #include "Common.h"
#ifndef HAVE_CONFIG_H
#define HAVE_ACE_STACK_TRACE_H 1
#endif
#ifdef HAVE_ACE_STACK_TRACE_H
#include "ace/Stack_Trace.h"
#endif
#ifdef HAVE_ACE_STACK_TRACE_H // old versions ACE not have Stack_Trace.h but used at some oS for better compatibility
#define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; fprintf( stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__,__FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); } } #define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; fprintf( stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__,__FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); } }
#else
#define WPAssert( assertion ) { if (!(assertion)) { fprintf( stderr, "\n%s:%i in %s ASSERTION FAILED2:\n %s\n", __FILE__, __LINE__,__FUNCTION__, #assertion); assert( #assertion &&0 ); } }
#endif
#define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } #define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); }
#define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } #define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8078" #define REVISION_NR "8079"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__