UBU est de retour ...

entre:
CXX=/usr/local/gcc-3.0.4/bin/g++ sur beny
CXX=g++3 sur bip
et CXX=g++ sur Fedora ...
je nage dans le bonheur ...
This commit is contained in:
Christophe Alexandre 2003-12-05 21:18:43 +00:00
parent 9b980263b5
commit 0b4e886145
6 changed files with 27 additions and 14 deletions

View File

@ -2,7 +2,6 @@
#include <iostream>
#include <math.h>
#include <string>
#include <assert.h>
#include "PConstants.h"
using namespace std;

View File

@ -1,9 +1,6 @@
#ifndef __PCOMMON_H
#define __PCOMMON_H
#include <ansidecl.h>
#if defined(GCC_VERSION) && (GCC_VERSION >= 3003)
#include <assert.h>
#endif
#include <iostream>
#include "mut.h"
#include "mlo.h"

View File

@ -1323,7 +1323,12 @@ void
PPlacement::InitPlaceWithPrePlace()
{
// abutment box
assert(_prePlaceFig);
if (!_prePlaceFig)
{
cerr << " o ERROR: impossible to init preplacement with empty preplacement figure" << endl;
exit(1);
}
int Width = _prePlaceFig->XAB2 - _prePlaceFig->XAB1;
int Height = _prePlaceFig->YAB2 - _prePlaceFig->YAB1;
@ -1521,7 +1526,11 @@ PPlacement::CreateSubRows(PRow* row, PrePlaceTab& tabpreplace,
row->_subRowsXMaxInv[srymit->first] = srymit->second;
}
}
assert(subrowscreated == nbsubrows);
if (subrowscreated != nbsubrows)
{
cerr << " o INTERNAL ERROR : in subrow creation" << endl;
exit (1);
}
}
// ======================================================================

View File

@ -12,10 +12,6 @@ using namespace __gnu_cxx; // GCC 3.1 and later
#endif
#endif
#endif
#include <ansidecl.h>
#if defined(GCC_VERSION) && (GCC_VERSION >= 3003)
#include <assert.h>
#endif
#include <iostream>
#include <fstream>

View File

@ -147,7 +147,11 @@ PPlacement::FinalInitialize()
eit != (*nit)->GetElems().end();
eit++)
{
assert(!dynamic_cast<PToPlaceIns*>(*eit));
if (!dynamic_cast<PToPlaceIns*>(*eit))
{
cerr << " o INTERNAL ERROR: FinalInitialize" << endl;
exit(1);
}
}
}
// on efface ce qui ne nous sert plus.

View File

@ -89,7 +89,11 @@ PRow::GetSubRow(const double X)
if (right == _subRowsXMax.end())
{
assert(left != _subRowsXMaxInv.end());
if (left == _subRowsXMaxInv.end())
{
cerr << " o INTERNAL ERROR: GetSubRow()" << endl;
exit(1);
}
return *_subRows[left->second];
}
@ -102,7 +106,11 @@ PRow::GetSubRow(const double X)
// si il n'y a rien a gauche...
if (left == _subRowsXMaxInv.end())
{
assert(right != _subRowsXMax.end());
if (right == _subRowsXMax.end())
{
cerr << " o INTERNAL ERROR: GetSubRow()" << endl;
exit(1);
}
return *_subRows[right->second];
}