X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cecfc5e7e54067ea099334a1fbce852ca69a6b11..c5750ccb5f8092e23e353b3923d5a78af17e672f:/utils/HelpGen/src/ifcontext.cpp

diff --git a/utils/HelpGen/src/ifcontext.cpp b/utils/HelpGen/src/ifcontext.cpp
index 3b2698a639..79f9c72a44 100644
--- a/utils/HelpGen/src/ifcontext.cpp
+++ b/utils/HelpGen/src/ifcontext.cpp
@@ -10,8 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "ifcontext.h"
-#pragma interface
+#  pragma implementation "ifcontext.h"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -25,7 +24,9 @@
 #include "wx/wx.h"
 #endif
 
-#include <malloc.h>
+#ifndef __DARWIN__
+#  include <malloc.h>
+#endif
 #include <stdio.h>
 
 #include "ifcontext.h"
@@ -34,11 +35,12 @@
 
 size_t spInterFileContext::GetFileNo( const string& fname )
 {
-	for( size_t i = 0; i != mFiles.size(); ++i )
-
-		if ( fname == mFiles[i] ) return i;
+    size_t i;
+	for ( i = 0; i != mFiles.size(); ++i )
+		if ( fname == mFiles[i] )
+            return i;
 
-	wxASSERT(0); // DBG::
+    wxFAIL_MSG("File not found in array in function spInterFileContext::GetFileNo()");
 	return 0;
 }
 
@@ -118,8 +120,8 @@ void spInterFileContext::DoAppendSourceFragment( string& source,
 
 		if ( cur >= pos + len ) // check if we've overstepped the current source-fragment
 		{
-			wxASSERT(0); // DBG:: with current imp. this should not happen
-			
+//			wxASSERT(0); // DBG:: with current imp. this should not happen
+            wxFAIL_MSG("Overstepped the current source fragment in function\nspInterFileContext::DoAppendSourceFragment()");			
 			cur = pos + len; break;
 		}
 	}