Your message dated Thu, 18 Aug 2005 01:13:14 +0200
with message-id <[EMAIL PROTECTED]>
and subject line obsolete bugreport
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 2 Aug 2004 12:49:13 +0000
>From [EMAIL PROTECTED] Mon Aug 02 05:49:12 2004
Return-path: <[EMAIL PROTECTED]>
Received: from c204112.adsl.hansenet.de (localhost) [213.39.204.112]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BrcFb-000543-00; Mon, 02 Aug 2004 05:49:12 -0700
Received: from aj by localhost with local (Exim 4.34)
id 1BrcFX-0004cQ-7J; Mon, 02 Aug 2004 14:49:09 +0200
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
From: Andreas Jochens <[EMAIL PROTECTED]>
Subject: tulip: FTBFS with gcc-3.4: `array' undeclared (first use this function)
Message-Id: <[EMAIL PROTECTED]>
Date: Mon, 02 Aug 2004 14:49:09 +0200
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_20,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Package: tulip
Severity: normal
Tags: patch
When building 'tulip' with gcc-3.4 I get the following error:
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx:120: error: `array'
undeclared (first use this function)
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx: In member function
`Obj tlp::geo::Vector<Obj, SIZE>::dotProduct(const tlp::geo::Vector<Obj,
SIZE>&) const':
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx:129: error: `array'
undeclared (first use this function)
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx: In member function
`tlp::geo::Vector<Obj, SIZE>& tlp::geo::Vector<Obj, SIZE>::fill(const Obj&)':
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx:138: error: `array'
undeclared (first use this function)
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx: In member function
`Obj tlp::geo::Vector<Obj, SIZE>::norm() const':
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx:146: error: `array'
undeclared (first use this function)
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx: In member function
`Obj tlp::geo::Vector<Obj, SIZE>::dist(const tlp::geo::Vector<Obj, SIZE>&)
const':
../../../library/tulip-geo/include/tulip/./cxx/Vector.cxx:168: error: `array'
undeclared (first use this function)
make[5]: *** [Color.lo] Error 1
make[5]: Leaving directory `/tulip-1.2.5/library/tulip/src'
With the attached patch 'tulip' can be compiled using gcc-3.4.
Regards
Andreas Jochens
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/GraphIterator.h
./library/tulip/include/tulip/GraphIterator.h
--- ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/GraphIterator.h
2003-01-19 23:19:54.000000000 +0100
+++ ./library/tulip/include/tulip/GraphIterator.h 2004-08-02
12:22:20.411415666 +0200
@@ -13,6 +13,7 @@
#include "Iterator.h"
#include "SuperGraph.h"
#include "SuperGraphImpl.h"
+#include "SubGraph.h"
#if (__GNUC__ < 3)
#include <hash_map>
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/Property.h
./library/tulip/include/tulip/Property.h
--- ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/Property.h
2003-01-20 18:40:43.000000000 +0100
+++ ./library/tulip/include/tulip/Property.h 2004-08-02 11:58:51.513016287
+0200
@@ -46,7 +46,7 @@
dataSet= context->dataSet;
}
else
- (void *)dataSet=(void *)superGraph = (void *)propertyProxy = (void
*)pluginProgress = (void *)NULL;
+ dataSet = NULL; superGraph = NULL; propertyProxy = NULL; pluginProgress
= NULL;
}
///
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/SimpleVector.h
./library/tulip/include/tulip/SimpleVector.h
--- ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/SimpleVector.h
2002-11-30 16:35:57.000000000 +0100
+++ ./library/tulip/include/tulip/SimpleVector.h 2004-08-02
12:23:54.267255975 +0200
@@ -24,7 +24,7 @@
explicit SimpleVector(size_t s) { begin=0; resize(s); }
void resize(size_t s) {
middleP=beginP+s;
- if (middle>endP || size()<capacity()/2)
+ if (this->middle>endP || size()<capacity()/2)
doRealloc(size());
}
iterator begin() { return beginP; }
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/SuperGraph.h
./library/tulip/include/tulip/SuperGraph.h
--- ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/SuperGraph.h
2003-04-29 11:37:58.000000000 +0200
+++ ./library/tulip/include/tulip/SuperGraph.h 2004-08-02 12:23:21.326629490
+0200
@@ -50,14 +50,14 @@
};
namespace STL_EXT_NS {
-struct hash<node>{size_t operator()(const node n) const {return n.id;}};
-struct hash<edge>{size_t operator()(const edge e) const {return e.id;}};
+template <> struct hash<node>{size_t operator()(const node n) const {return
n.id;}};
+template <> struct hash<edge>{size_t operator()(const edge e) const {return
e.id;}};
}
namespace std {
-struct equal_to<node>{size_t operator()(const node n,const node n2) const
{return n.id==n2.id;}};
-struct equal_to<edge>{size_t operator()(const edge e,const edge e2) const
{return e.id==e2.id;}};
-struct less<node>{size_t operator()(const node n,const node n2) const {return
n.id<n2.id;}};
-struct less<edge>{size_t operator()(const edge e,const edge e2) const {return
e.id<e2.id;}};
+template <> struct equal_to<node>{size_t operator()(const node n,const node
n2) const {return n.id==n2.id;}};
+template <> struct equal_to<edge>{size_t operator()(const edge e,const edge
e2) const {return e.id==e2.id;}};
+template <> struct less<node>{size_t operator()(const node n,const node n2)
const {return n.id<n2.id;}};
+template <> struct less<edge>{size_t operator()(const edge e,const edge e2)
const {return e.id<e2.id;}};
}
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/cxx/Reflect.cxx
./library/tulip/include/tulip/cxx/Reflect.cxx
--- ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/cxx/Reflect.cxx
2002-12-06 16:39:53.000000000 +0100
+++ ./library/tulip/include/tulip/cxx/Reflect.cxx 2004-08-02
12:58:06.911100306 +0200
@@ -29,7 +29,7 @@
template<typename T> bool DataSet::getAndFree(const std::string &str,T& value)
{
if (get(str,value)) {
delete ((T*)(data[str].value));
- data.remove(str);
+ data.erase(str);
return true;
}
else
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/tulipconf.h
./library/tulip/include/tulip/tulipconf.h
--- ../tmp-orig/tulip-1.2.5/library/tulip/include/tulip/tulipconf.h
2003-03-13 15:20:34.000000000 +0100
+++ ./library/tulip/include/tulip/tulipconf.h 2004-08-02 12:46:33.432278013
+0200
@@ -8,7 +8,7 @@
#else
# define STL_EXT_NS __gnu_cxx
# define _DEPRECATED __attribute__ ((deprecated))
-# include <ext/stl_hash_fun.h>
+//# include <ext/stl_hash_fun.h>
#endif
#include <string>
diff -urN
../tmp-orig/tulip-1.2.5/library/tulip-geo/include/tulip/cxx/Vector.cxx
./library/tulip-geo/include/tulip/cxx/Vector.cxx
--- ../tmp-orig/tulip-1.2.5/library/tulip-geo/include/tulip/cxx/Vector.cxx
2003-04-01 20:30:26.000000000 +0200
+++ ./library/tulip-geo/include/tulip/cxx/Vector.cxx 2004-08-01
22:30:04.000000000 +0200
@@ -3,13 +3,13 @@
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator*=(const Obj &scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]*=scalaire;
+ this->array[i]*=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator*=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]*=vecto[i];
+ this->array[i]*=vecto[i];
return (*this);
}
@@ -17,14 +17,14 @@
VECTORTLP & VECTORTLP::operator/=(const Obj &scalaire) {
assert(scalaire!=0);
for (unsigned int i=0;i<SIZE;++i)
- array[i]/=scalaire;
+ this->array[i]/=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator/=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i) {
assert(vecto[i]!=0);
- array[i]/=vecto[i];
+ this->array[i]/=vecto[i];
}
return (*this);
}
@@ -32,26 +32,26 @@
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator+=(const Obj &scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]+=scalaire;
+ this->array[i]+=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator+=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]+=vecto[i];
+ this->array[i]+=vecto[i];
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator-=(const Obj &scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]-=scalaire;
+ this->array[i]-=scalaire;
return (*this);
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::operator-=(const VECTORTLP &vecto) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]-=vecto[i];
+ this->array[i]-=vecto[i];
return (*this);
}
@@ -96,13 +96,13 @@
VECTORTLP result;
switch(SIZE){
case 3:
- result[0]=array[1]*v[2]-array[2]*v[1];
- result[1]=array[2]*v[0]-array[0]*v[2];
- result[2]=array[0]*v[1]-array[1]*v[0];
+ result[0]=this->array[1]*v[2]-this->array[2]*v[1];
+ result[1]=this->array[2]*v[0]-this->array[0]*v[2];
+ result[2]=this->array[0]*v[1]-this->array[1]*v[0];
return result;
break;
default :
- std::cerr << "cross product not implemented for dimension :" << SIZE <<
endl;
+ std::cerr << "cross product not implemented for dimension :" << SIZE <<
std::endl;
break;
}
}
@@ -110,14 +110,14 @@
template <typename Obj,unsigned int SIZE>
bool VECTORTLP::operator!=(const VECTORTLP &vecto) const {
for (unsigned int i=0;i<SIZE;++i)
- if (array[i]!=vecto[i]) return true;
+ if (this->array[i]!=vecto[i]) return true;
return false;
}
template <typename Obj,unsigned int SIZE>
bool VECTORTLP::operator==(const VECTORTLP &vecto) const {
for (unsigned int i=0;i<SIZE;++i)
- if (array[i]!=vecto[i]) return false;
+ if (this->array[i]!=vecto[i]) return false;
return true;
}
@@ -126,16 +126,16 @@
template <typename Obj,unsigned int SIZE>
Obj VECTORTLP::dotProduct(const VECTORTLP &v) const{
assert (SIZE>0);
- Obj tmpO= array[0] * v[0];
+ Obj tmpO= this->array[0] * v[0];
for (unsigned int i=1;i<SIZE;++i)
- tmpO+= array[i] * v[i];
+ tmpO+= this->array[i] * v[i];
return tmpO;
}
template <typename Obj,unsigned int SIZE>
VECTORTLP & VECTORTLP::fill(const Obj& scalaire) {
for (unsigned int i=0;i<SIZE;++i)
- array[i]=scalaire;
+ this->array[i]=scalaire;
return (*this);
}
@@ -143,17 +143,17 @@
Obj VECTORTLP::norm() const{
switch(SIZE){
case 1:
- return array[0];
+ return this->array[0];
case 2:
- return sqrt(array[0]*array[0]+array[1]*array[1]);
+ return sqrt(this->array[0]*this->array[0]+this->array[1]*this->array[1]);
break;
case 3:
- return sqrt(array[0]*array[0]+array[1]*array[1]+array[2]*array[2]);
+ return
sqrt(this->array[0]*this->array[0]+this->array[1]*this->array[1]+this->array[2]*this->array[2]);
break;
default :
Obj tmp=0;
for (unsigned int i=0;i<SIZE;++i)
- tmp+=array[i]*array[i];
+ tmp+=this->array[i]*this->array[i];
return(sqrt(tmp));
break;
}
@@ -165,15 +165,15 @@
case 1:
return 0;
case 2:
- return
sqrt((array[0]-c.array[0])*(array[0]-c.array[0])+(array[1]-c.array[1])*(array[1]-c.array[1]));
+ return
sqrt((this->array[0]-c.array[0])*(this->array[0]-c.array[0])+(this->array[1]-c.array[1])*(this->array[1]-c.array[1]));
break;
case 3:
- return
sqrt((array[0]-c.array[0])*(array[0]-c.array[0])+(array[1]-c.array[1])*(array[1]-c.array[1])+(array[2]-c.array[2])*(array[2]-c.array[2]));
+ return
sqrt((this->array[0]-c.array[0])*(this->array[0]-c.array[0])+(this->array[1]-c.array[1])*(this->array[1]-c.array[1])+(this->array[2]-c.array[2])*(this->array[2]-c.array[2]));
break;
default :
Obj tmp=0;
for (unsigned int i=0;i<SIZE;++i)
- tmp+=(array[i]-c.array[i])*(array[i]-c.array[i]);
+ tmp+=(this->array[i]-c.array[i])*(this->array[i]-c.array[i]);
return(sqrt(tmp));
break;
}
diff -urN ../tmp-orig/tulip-1.2.5/library/tulip-ogl/src/Glyph.cpp
./library/tulip-ogl/src/Glyph.cpp
--- ../tmp-orig/tulip-1.2.5/library/tulip-ogl/src/Glyph.cpp 2003-01-28
11:44:37.000000000 +0100
+++ ./library/tulip-ogl/src/Glyph.cpp 2004-08-02 13:38:24.165398006 +0200
@@ -16,7 +16,7 @@
LOD=gc->LOD;
}
else {
- (void *)superGraph = (void *)glGraph = (void *)NULL;
+ superGraph = 0; glGraph = 0;
LOD=LOF=0;
}
}
diff -urN ../tmp-orig/tulip-1.2.5/plugins/clustering/EqualValueClustering.cpp
./plugins/clustering/EqualValueClustering.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/clustering/EqualValueClustering.cpp
2003-04-02 10:57:11.000000000 +0200
+++ ./plugins/clustering/EqualValueClustering.cpp 2004-08-02
13:54:58.428023162 +0200
@@ -19,7 +19,7 @@
{}
namespace STL_EXT_NS {
- struct hash<double> {
+ template <> struct hash<double> {
size_t operator()(const double s) const { return (size_t)s; }
};
};
diff -urN ../tmp-orig/tulip-1.2.5/plugins/clustering/QuotientClustering.cpp
./plugins/clustering/QuotientClustering.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/clustering/QuotientClustering.cpp
2003-04-01 20:33:06.000000000 +0200
+++ ./plugins/clustering/QuotientClustering.cpp 2004-08-02 13:55:33.336268943
+0200
@@ -20,7 +20,7 @@
};
namespace std {
- struct less<edgeS> {
+ template <> struct less<edgeS> {
bool operator()(const edgeS &c,const edgeS &d) const {
if (c.source<d.source) return true;
if (c.source>d.source) return false;
@@ -36,7 +36,7 @@
QuotientClustering::~QuotientClustering(){}
namespace STL_EXT_NS {
- struct hash<double> {
+ template <> struct hash<double> {
size_t operator()(const double s) const { return (size_t)s; }
};
};
diff -urN ../tmp-orig/tulip-1.2.5/plugins/import/CirculantGraph.cpp
./plugins/import/CirculantGraph.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/import/CirculantGraph.cpp 2003-04-02
21:49:37.000000000 +0200
+++ ./plugins/import/CirculantGraph.cpp 2004-08-02 14:06:14.413230206 +0200
@@ -9,7 +9,7 @@
};
namespace std {
- struct less<edgeS>
+ template <> struct less<edgeS>
{
bool operator()(const edgeS &c,const edgeS &d) const
{
diff -urN ../tmp-orig/tulip-1.2.5/plugins/import/RandomGraph.cpp
./plugins/import/RandomGraph.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/import/RandomGraph.cpp 2003-04-02
21:49:00.000000000 +0200
+++ ./plugins/import/RandomGraph.cpp 2004-08-02 13:56:54.534558296 +0200
@@ -9,7 +9,7 @@
};
namespace std {
- struct less<edgeS>
+ template <> struct less<edgeS>
{
bool operator()(const edgeS &c,const edgeS &d) const
{
diff -urN ../tmp-orig/tulip-1.2.5/plugins/import/RandomSimpleGraph.cpp
./plugins/import/RandomSimpleGraph.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/import/RandomSimpleGraph.cpp
2003-03-18 10:22:30.000000000 +0100
+++ ./plugins/import/RandomSimpleGraph.cpp 2004-08-02 13:57:49.830859295
+0200
@@ -9,7 +9,7 @@
};
namespace std {
- struct less<edgeS> {
+ template <> struct less<edgeS> {
bool operator()(const edgeS &c,const edgeS &d) const {
int cs,ct,ds,dt;
if (c.source<=c.target) {
diff -urN ../tmp-orig/tulip-1.2.5/plugins/layout/GEM.h ./plugins/layout/GEM.h
--- ../tmp-orig/tulip-1.2.5/plugins/layout/GEM.h 2003-04-01
20:33:06.000000000 +0200
+++ ./plugins/layout/GEM.h 2004-08-02 14:07:51.010540081 +0200
@@ -153,30 +153,30 @@
* GEM Defualt Parameter Values
*/
- static const float IMAXTEMPDEF = (float)1.0;
- static const float ISTARTTEMPDEF = (float)0.3;
- static const float IFINALTEMPDEF = (float)0.05;
+ static const float IMAXTEMPDEF = 1.0;
+ static const float ISTARTTEMPDEF = 0.3;
+ static const float IFINALTEMPDEF = 0.05;
static const int IMAXITERDEF = 10;
- static const float IGRAVITYDEF = (float)0.05;
- static const float IOSCILLATIONDEF = (float)0.4;
- static const float IROTATIONDEF = (float)0.5;
- static const float ISHAKEDEF = (float)0.2;
- static const float AMAXTEMPDEF = (float)1.5;
- static const float ASTARTTEMPDEF = (float)1.0;
- static const float AFINALTEMPDEF = (float)0.02;
+ static const float IGRAVITYDEF = 0.05;
+ static const float IOSCILLATIONDEF = 0.4;
+ static const float IROTATIONDEF = 0.5;
+ static const float ISHAKEDEF = 0.2;
+ static const float AMAXTEMPDEF = 1.5;
+ static const float ASTARTTEMPDEF = 1.0;
+ static const float AFINALTEMPDEF = 0.02;
static const int AMAXITERDEF = 3;
- static const float AGRAVITYDEF = (float)0.1;
- static const float AOSCILLATIONDEF = (float)0.4;
- static const float AROTATIONDEF = (float)0.9;
- static const float ASHAKEDEF = (float)0.3;
- static const float OMAXTEMPDEF = (float)0.25;
- static const float OSTARTTEMPDEF = (float)1.0;
- static const float OFINALTEMPDEF = (float)1.0;
+ static const float AGRAVITYDEF = 0.1;
+ static const float AOSCILLATIONDEF = 0.4;
+ static const float AROTATIONDEF = 0.9;
+ static const float ASHAKEDEF = 0.3;
+ static const float OMAXTEMPDEF = 0.25;
+ static const float OSTARTTEMPDEF = 1.0;
+ static const float OFINALTEMPDEF = 1.0;
static const int OMAXITERDEF = 3;
- static const float OGRAVITYDEF = (float)0.1;
- static const float OOSCILLATIONDEF = (float)0.4;
- static const float OROTATIONDEF = (float)0.9;
- static const float OSHAKEDEF = (float)0.3;
+ static const float OGRAVITYDEF = 0.1;
+ static const float OOSCILLATIONDEF = 0.4;
+ static const float OROTATIONDEF = 0.9;
+ static const float OSHAKEDEF = 0.3;
/*
* Following parameters can be initialised in the original GEM
diff -urN ../tmp-orig/tulip-1.2.5/plugins/layout/GEM3D.h
./plugins/layout/GEM3D.h
--- ../tmp-orig/tulip-1.2.5/plugins/layout/GEM3D.h 2003-02-26
19:15:42.000000000 +0100
+++ ./plugins/layout/GEM3D.h 2004-08-02 14:08:59.622264746 +0200
@@ -153,30 +153,30 @@
* GEM3D Defualt Parameter Values
*/
- static const float IMAXTEMPDEF = (float)1.0;
- static const float ISTARTTEMPDEF = (float)0.3;
- static const float IFINALTEMPDEF = (float)0.05;
+ static const float IMAXTEMPDEF = 1.0;
+ static const float ISTARTTEMPDEF = 0.3;
+ static const float IFINALTEMPDEF = 0.05;
static const int IMAXITERDEF = 10;
- static const float IGRAVITYDEF = (float)0.05;
- static const float IOSCILLATIONDEF = (float)0.4;
- static const float IROTATIONDEF = (float)0.5;
- static const float ISHAKEDEF = (float)0.2;
- static const float AMAXTEMPDEF = (float)1.5;
- static const float ASTARTTEMPDEF = (float)1.0;
- static const float AFINALTEMPDEF = (float)0.02;
+ static const float IGRAVITYDEF = 0.05;
+ static const float IOSCILLATIONDEF = 0.4;
+ static const float IROTATIONDEF = 0.5;
+ static const float ISHAKEDEF = 0.2;
+ static const float AMAXTEMPDEF = 1.5;
+ static const float ASTARTTEMPDEF = 1.0;
+ static const float AFINALTEMPDEF = 0.02;
static const int AMAXITERDEF = 3;
- static const float AGRAVITYDEF = (float)0.1;
- static const float AOSCILLATIONDEF = (float)0.4;
- static const float AROTATIONDEF = (float)0.9;
- static const float ASHAKEDEF = (float)0.3;
- static const float OMAXTEMPDEF = (float)0.25;
- static const float OSTARTTEMPDEF = (float)1.0;
- static const float OFINALTEMPDEF = (float)1.0;
+ static const float AGRAVITYDEF = 0.1;
+ static const float AOSCILLATIONDEF = 0.4;
+ static const float AROTATIONDEF = 0.9;
+ static const float ASHAKEDEF = 0.3;
+ static const float OMAXTEMPDEF = 0.25;
+ static const float OSTARTTEMPDEF = 1.0;
+ static const float OFINALTEMPDEF = 1.0;
static const int OMAXITERDEF = 3;
- static const float OGRAVITYDEF = (float)0.1;
- static const float OOSCILLATIONDEF = (float)0.4;
- static const float OROTATIONDEF = (float)0.9;
- static const float OSHAKEDEF = (float)0.3;
+ static const float OGRAVITYDEF = 0.1;
+ static const float OOSCILLATIONDEF = 0.4;
+ static const float OROTATIONDEF = 0.9;
+ static const float OSHAKEDEF = 0.3;
/*
* Following parameters can be initialised in the original GEM3D
diff -urN ../tmp-orig/tulip-1.2.5/plugins/metric/StrahlerAllMetric.cpp
./plugins/metric/StrahlerAllMetric.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/metric/StrahlerAllMetric.cpp
2002-12-06 16:39:55.000000000 +0100
+++ ./plugins/metric/StrahlerAllMetric.cpp 2004-08-02 14:15:31.321476848
+0200
@@ -18,7 +18,7 @@
}
};
- struct equal_to<couple>
+ template <> struct equal_to<couple>
{
bool operator()(const couple &c,const couple &d)
{
@@ -27,7 +27,7 @@
}
};
- struct less<couple>
+ template <> struct less<couple>
{
bool operator()(const couple &c,const couple &d)
{
diff -urN ../tmp-orig/tulip-1.2.5/plugins/metric/StrahlerMetric.cpp
./plugins/metric/StrahlerMetric.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/metric/StrahlerMetric.cpp 2002-12-06
16:39:55.000000000 +0100
+++ ./plugins/metric/StrahlerMetric.cpp 2004-08-02 14:14:32.630832603 +0200
@@ -27,7 +27,7 @@
}
};
- struct equal_to<couple> {
+ template <> struct equal_to<couple> {
bool operator()(const couple &c,const couple &d)
{
if ((c.r==d.r) && (c.p==d.p)) return true;
@@ -35,7 +35,7 @@
}
};
- struct less<couple>
+ template <> struct less<couple>
{
bool operator()(const couple &c,const couple &d) {
if (c.r<d.r) return true;
diff -urN ../tmp-orig/tulip-1.2.5/plugins/selection/MultipleEdgeSelection.cpp
./plugins/selection/MultipleEdgeSelection.cpp
--- ../tmp-orig/tulip-1.2.5/plugins/selection/MultipleEdgeSelection.cpp
2003-04-01 20:39:52.000000000 +0200
+++ ./plugins/selection/MultipleEdgeSelection.cpp 2004-08-02
14:17:32.456039134 +0200
@@ -29,7 +29,7 @@
};
namespace std {
- struct less<edgeS> {
+ template <> struct less<edgeS> {
bool operator()(const edgeS &c,const edgeS &d) const {
if (c.source.id<d.source.id) return true;
if (c.source.id>d.source.id) return false;
---------------------------------------
Received: (at 262959-close) by bugs.debian.org; 17 Aug 2005 23:10:06 +0000
>From [EMAIL PROTECTED] Wed Aug 17 16:10:05 2005
Return-path: <[EMAIL PROTECTED]>
Received: from postfix3-1.free.fr [213.228.0.44]
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1E5X2r-00087U-00; Wed, 17 Aug 2005 16:10:05 -0700
Received: from bylbo.nowhere.earth (nan92-1-81-57-214-146.fbx.proxad.net
[81.57.214.146])
by postfix3-1.free.fr (Postfix) with ESMTP id E5BD517348A
for <[EMAIL PROTECTED]>; Thu, 18 Aug 2005 01:10:04 +0200 (CEST)
Received: from dwitch by bylbo.nowhere.earth with local (Exim 4.52)
id 1E5X5v-0005Zj-43
for [EMAIL PROTECTED]; Thu, 18 Aug 2005 01:13:15 +0200
Date: Thu, 18 Aug 2005 01:13:14 +0200
To: [EMAIL PROTECTED]
Subject: obsolete bugreport
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
From: Yann Dirson <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2005_01_02
This failure happens with an old version of the package. Failures of
the current one with g++-4.0 are addressed in the next uploaed.
--
Yann Dirson <[EMAIL PROTECTED]> |
Debian-related: <[EMAIL PROTECTED]> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
