[Firebird-checkins] CVS: firebird2/src/jrd isc_sync.cpp,1.42,1.43

[Blas R. S. <br...@us...>]

Build Version :  T1.5.0.2718 Firebird 1.5 Beta 3

(writeBuildNum.sh,v 1.2704 2003/02/28 17:02:38 brodsom Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1:/tmp/cvs-serv5544/jrd

Modified Files:
	isc_sync.cpp 
Log Message:
-Remove the SOLARIS specific stuff, NDEBUG is set at the compiler command line, and assert.h is obsolete when gdsassert can be used.
-Change assert to fb_assert when gdsassert is in use. to make clear if we use the standard macro or the fb one.

Index: isc_sync.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/isc_sync.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -b -U3 -r1.42 -r1.43
--- isc_sync.cpp	14 Feb 2003 02:24:43 -0000	1.42
+++ isc_sync.cpp	28 Feb 2003 17:02:11 -0000	1.43
@@ -46,13 +46,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef SOLARIS
-#ifndef DEV_BUILD
-#define NDEBUG					/* Turn off assert() macros */
-#endif
-#include <assert.h>
-#endif
-
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
 #endif
@@ -468,7 +461,7 @@
    we never actually make use of it.  This implementation wont
    support it anyway as Solaris doesn't provide a "wait for one
    of a series of conditions" function */
-	assert(count == 1);
+	fb_assert(count == 1);
 
 /* If we're not blocked, the rest is a gross waste of time */
 
@@ -690,7 +683,7 @@
 #ifdef HP10
 
 	{
-		assert(ret == -1);
+		fb_assert(ret == -1);
 		gds__log
 			("ISC_event_post: pthread_cond_broadcast failed with errno = %d",
 			 errno);
@@ -736,7 +729,7 @@
    we never actually make use of it.  This implementation wont
    support it anyway as Solaris doesn't provide a "wait for one
    of a series of conditions" function */
-	assert(count == 1);
+	fb_assert(count == 1);
 
 /* If we're not blocked, the rest is a gross waste of time */
 
@@ -2429,7 +2422,7 @@
 		return NULL;
 	}
 
-	assert(length <= buf.shm_segsz);
+	fb_assert(length <= buf.shm_segsz);
 	if (length < buf.shm_segsz)
 		if (length) {
 			if (shmctl(shmid, IPC_RMID, &buf) == -1) {
@@ -3204,7 +3197,7 @@
 	state = pthread_mutex_init(mutex->mtx_mutex, pthread_mutexattr_default);
 	if (!state)
 		return 0;
-	assert(state == -1);		/* if state is not 0, it should be -1 */
+	fb_assert(state == -1);		/* if state is not 0, it should be -1 */
 	return errno;
 
 #endif /* linux */
@@ -3232,7 +3225,7 @@
 	state = pthread_mutex_lock(mutex->mtx_mutex);
 	if (!state)
 		return 0;
-	assert(state == -1);		/* if state is not 0, it should be -1 */
+	fb_assert(state == -1);		/* if state is not 0, it should be -1 */
 	return errno;
 
 #else
@@ -3278,7 +3271,7 @@
 	if (state == 1)
 		return 0;
 
-	assert(state == -1);		/* if state is not 0 or 1, it should be -1 */
+	fb_assert(state == -1);		/* if state is not 0 or 1, it should be -1 */
 	return errno;
 
 #else
@@ -3308,7 +3301,7 @@
 	state = pthread_mutex_unlock(mutex->mtx_mutex);
 	if (!state)
 		return 0;
-	assert(state == -1);		/* if state is not 0, it should be -1 */
+	fb_assert(state == -1);		/* if state is not 0, it should be -1 */
 	return errno;
 
 #else