ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed ASSERT_MESSAGE and ERROR_MESSAGE macros to use proper

Browse source 
do{}while(0) encapsulation to protect them when used in an if block
without {}
previously they used else to consume the trailing ; but this
could just as easily consume any other following statement
(very dangerous in concept, but no damage done in this case)
this causes no change whatsoever in release builds


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@152 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
Forest Hale 2007-03-05 23:45:55 +00:00
parent e5de74a41f
commit 5dd408d91d
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/debugging/debugging.h
View file

@ -112,17 +112,17 @@ inline DebugMessageHandler& globalDebugMessageHandler()
#if defined(DEBUG_ASSERTS)
/// \brief Sends a \p message to the current debug-message-handler text-output-stream if \p condition evaluates to false.
#define ASSERT_MESSAGE(condition, message)\
#define ASSERT_MESSAGE(condition, message) do{\
if(!(condition))\
{\
globalDebugMessageHandler().getOutputStream() << FILE_LINE "\nassertion failure: " << message << "\n";\
if(!globalDebugMessageHandler().handleMessage()) { DEBUGGER_BREAKPOINT(); }\
} else\
}} while(0)
/// \brief Sends a \p message to the current debug-message-handler text-output-stream.
#define ERROR_MESSAGE(message)\
#define ERROR_MESSAGE(message) do{\
globalDebugMessageHandler().getOutputStream() << FILE_LINE "\nruntime error: " << message << "\n";\
if(!globalDebugMessageHandler().handleMessage()) { DEBUGGER_BREAKPOINT(); } else\
if(!globalDebugMessageHandler().handleMessage()) { DEBUGGER_BREAKPOINT(); }} while(0)
#define ASSERT_NOTNULL(ptr) ASSERT_MESSAGE(ptr != 0, "pointer \"" #ptr "\" is null")

2
radiant/brush.h
View file

@ -3099,7 +3099,7 @@ public:
m_face->getWinding()[2].vertex
),
"update_move_planepts_vertex2: error"
)
);
m_face->m_move_planepts[0] = m_face->getWinding()[opposite].vertex;
m_face->m_move_planepts[1] = m_face->getWinding()[index].vertex;

6
radiant/dialog.cpp
View file

@ -378,14 +378,14 @@ Dialog::~Dialog()
void Dialog::ShowDlg()
{
ASSERT_MESSAGE(m_window != 0, "dialog was not constructed")
ASSERT_MESSAGE(m_window != 0, "dialog was not constructed");
importData();
gtk_widget_show(GTK_WIDGET(m_window));
}
void Dialog::HideDlg()
{
ASSERT_MESSAGE(m_window != 0, "dialog was not constructed")
ASSERT_MESSAGE(m_window != 0, "dialog was not constructed");
exportData();
gtk_widget_hide(GTK_WIDGET(m_window));
}
@ -399,7 +399,7 @@ static gint delete_event_callback(GtkWidget *widget, GdkEvent* event, gpointer d
void Dialog::Create()
{
ASSERT_MESSAGE(m_window == 0, "dialog cannot be constructed")
ASSERT_MESSAGE(m_window == 0, "dialog cannot be constructed");
m_window = BuildDialog();
g_signal_connect(G_OBJECT(m_window), "delete_event", G_CALLBACK(delete_event_callback), this);

4
radiant/mainframe.cpp
View file

@ -3310,7 +3310,11 @@ void GlobalGL_sharedContextCreated()
GlobalShaderCache().realise();
Textures_Realise();
#ifdef __linux__
g_font = glfont_create("fixed 8");
#else
g_font = glfont_create("courier 8");
#endif
GlobalOpenGL().m_font = g_font.getDisplayList();
GlobalOpenGL().m_fontHeight = g_font.getPixelHeight();
}