[Firebird-checkins] SF.net SVN: firebird:[52464] firebird/trunk/src/jrd/vio.cpp

[<asf...@us...>]

Revision: 52464
          http://firebird.svn.sourceforge.net/firebird/?rev=52464&view=rev
Author:   asfernandes
Date:     2011-02-25 15:28:10 +0000 (Fri, 25 Feb 2011)

Log Message:
-----------
The (bad) definition of fb_assert cause this code to not work in clang. It's a surprive if it works in MSVC.

Modified Paths:
--------------
    firebird/trunk/src/jrd/vio.cpp

Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp	2011-02-25 13:06:14 UTC (rev 52463)
+++ firebird/trunk/src/jrd/vio.cpp	2011-02-25 15:28:10 UTC (rev 52464)
@@ -1877,10 +1877,14 @@
 			 rpb->rpb_f_page, rpb->rpb_f_line);
 	}
 #endif
-	if (rpb->rpb_stream_flags & RPB_s_undo_data) 
+	if (rpb->rpb_stream_flags & RPB_s_undo_data)
+	{
 		fb_assert(rpb->getWindow(tdbb).win_bdb == NULL);
+	}
 	else
+	{
 		fb_assert(rpb->getWindow(tdbb).win_bdb != NULL);
+	}
 
 	if (pool && !(rpb->rpb_stream_flags & RPB_s_undo_data))
 	{
@@ -2650,10 +2654,14 @@
 		}
 	} while (!VIO_chase_record_version(tdbb, rpb, transaction, pool, false));
 
-	if (rpb->rpb_stream_flags & RPB_s_undo_data) 
+	if (rpb->rpb_stream_flags & RPB_s_undo_data)
+	{
 		fb_assert(rpb->getWindow(tdbb).win_bdb == NULL);
+	}
 	else
+	{
 		fb_assert(rpb->getWindow(tdbb).win_bdb != NULL);
+	}
 
 	if (pool && !(rpb->rpb_stream_flags & RPB_s_undo_data))
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.