From cc6a5cc05f3c2cde24338d35c9714f1e7ebf032e Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Mon, 3 Jul 2000 09:24:12 +0000
Subject: Import the most recent ncurses 5.1 prerelease (20000701). Mostly this
 is intended to resolve the trace() badness once and for all.

Obtained from:  ftp://dickey.his.com/ncurses/
---
 contrib/ncurses/c++/cursesf.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'contrib/ncurses/c++/cursesf.cc')

diff --git a/contrib/ncurses/c++/cursesf.cc b/contrib/ncurses/c++/cursesf.cc
index 12b9cd4..a993322 100644
--- a/contrib/ncurses/c++/cursesf.cc
+++ b/contrib/ncurses/c++/cursesf.cc
@@ -35,7 +35,7 @@
 #include "cursesapp.h"
 #include "internal.h"
 
-MODULE_ID("$Id: cursesf.cc,v 1.9 1999/05/16 17:29:36 juergen Exp $")
+MODULE_ID("$Id: cursesf.cc,v 1.10 1999/10/30 23:49:28 tom Exp $")
   
 NCursesFormField::~NCursesFormField () {
   if (field)
@@ -49,7 +49,7 @@ FIELD**
 NCursesForm::mapFields(NCursesFormField* nfields[]) {
   int fieldCount = 0,lcv;
   
-  assert(nfields);
+  assert(nfields != 0);
 
   for (lcv=0; nfields[lcv]->field; ++lcv)
     ++fieldCount;
@@ -350,18 +350,18 @@ NCursesForm::virtualize(int c) {
 //
 bool UserDefinedFieldType::fcheck(FIELD *f, const void *u) {
   NCursesFormField* F = (NCursesFormField*)u;
-  assert(F);
+  assert(F != 0);
   UserDefinedFieldType* udf = (UserDefinedFieldType*)(F->fieldtype());
-  assert(udf);
+  assert(udf != 0);
   return udf->field_check(*F);
 }
 
 bool UserDefinedFieldType::ccheck(int c, const void *u) {
   NCursesFormField* F = (NCursesFormField*)u;
-  assert(F);
+  assert(F != 0);
   UserDefinedFieldType* udf = 
     (UserDefinedFieldType*)(F->fieldtype());
-  assert(udf);
+  assert(udf != 0);
   return udf->char_check(c);
 }
 
@@ -379,19 +379,19 @@ FIELDTYPE* UserDefinedFieldType_With_Choice::generic_fieldtype_with_choice =
 
 bool UserDefinedFieldType_With_Choice::next_choice(FIELD *f, const void *u) {
   NCursesFormField* F = (NCursesFormField*)u;
-  assert(F);
+  assert(F != 0);
   UserDefinedFieldType_With_Choice* udf = 
     (UserDefinedFieldType_With_Choice*)(F->fieldtype());
-  assert(udf);
+  assert(udf != 0);
   return udf->next(*F);
 }
 
 bool UserDefinedFieldType_With_Choice::prev_choice(FIELD *f, const void *u) {
   NCursesFormField* F = (NCursesFormField*)u;
-  assert(F);
+  assert(F != 0);
   UserDefinedFieldType_With_Choice* udf = 
     (UserDefinedFieldType_With_Choice*)(F->fieldtype());
-  assert(udf);
+  assert(udf != 0);
   return udf->previous(*F);
 }
 
-- 
cgit v1.1