Compile portability issues.

This commit is contained in:
Stephen Williams 2008-02-05 20:36:57 -08:00
parent 3d2e791e52
commit fb63bf7dba
3 changed files with 14 additions and 10 deletions

View File

@ -465,9 +465,14 @@ void NetPartSelect::dump_node(ostream&o, unsigned ind) const
break; break;
} }
o << setw(ind) << "" << "NetPartSelect(" << pt << "): " o << setw(ind) << "" << "NetPartSelect(" << pt << "): "
<< name() << " #(" << rise_time() << name();
<< "," << fall_time() << "," << decay_time() << ") " if (rise_time())
<< " off=" << off_ << " wid=" << wid_ <<endl; o << " #(" << *rise_time()
<< "," << *fall_time()
<< "," << *decay_time() << ")";
else
o << " #(.,.,.)";
o << " off=" << off_ << " wid=" << wid_ <<endl;
dump_node_pins(o, ind+4); dump_node_pins(o, ind+4);
dump_obj_attr(o, ind+4); dump_obj_attr(o, ind+4);
} }
@ -535,9 +540,11 @@ void NetSysFunc::dump_node(ostream&o, unsigned ind) const
void NetUserFunc::dump_node(ostream&o, unsigned ind) const void NetUserFunc::dump_node(ostream&o, unsigned ind) const
{ {
o << setw(ind) << "" << "USER FUNC: " o << setw(ind) << "" << "USER FUNC: "
<< scope_path(def_) << scope_path(def_);
<< " #(" <<*rise_time()<<","<<*fall_time() << "," <<*decay_time() << ")" if (rise_time())
<< endl; o << " #(" <<*rise_time()
<<","<<*fall_time()
<< "," <<*decay_time() << ")" << endl;
dump_node_pins(o, ind+4); dump_node_pins(o, ind+4);
dump_obj_attr(o, ind+4); dump_obj_attr(o, ind+4);
} }

View File

@ -19,9 +19,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ifdef HAVE_CVS_IDENT
#ident "$Id: cfparse_misc.h,v 1.6 2004/02/15 18:03:30 steve Exp $"
#endif
/* /*
* The vlltype supports the passing of detailed source file location * The vlltype supports the passing of detailed source file location

View File

@ -103,7 +103,7 @@ struct __vpirt {
* "base" that is a __vpiHandle object. This template can convert any * "base" that is a __vpiHandle object. This template can convert any
* of those structures into a vpiHandle object. * of those structures into a vpiHandle object.
*/ */
template <class T> struct __vpiHandle*vpi_handle(T obj) template <class T> vpiHandle vpi_handle(T obj)
{ return &obj->base; } { return &obj->base; }
/* /*