Your message dated Wed, 12 Oct 2005 15:26:27 +1000
with message-id <[EMAIL PROTECTED]>
and subject line Closing regina-normal FTBFS
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; 26 Jul 2005 06:08:14 +0000
>From [EMAIL PROTECTED] Mon Jul 25 23:08:14 2005
Return-path: <[EMAIL PROTECTED]>
Received: from roar.cs.berkeley.edu (roar.quarl.org) [128.32.35.215] (postfix)
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1DxHnW-0001gC-00; Mon, 25 Jul 2005 22:16:10 -0700
Received: by roar.quarl.org (Postfix, from userid 18378)
id 81CB1143C9; Mon, 25 Jul 2005 22:15:54 -0700 (PDT)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Karl Chen <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: regina-normal: FTBFS with gcc-3.4/gcc-4.0: various
X-Mailer: reportbug 3.15
Date: Mon, 25 Jul 2005 22:15:54 -0700
Message-Id: <[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=-6.5 required=4.0 tests=BAYES_10,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
Package: regina-normal
Severity: normal
Tags: patch
'regina-normal' fails to build from source using gcc-3.4/gcc-4.0.
The following patch allows regina-normal to build under gcc-3.4.
--- engine/engine/maths/nmatrix.h.orig 2005-07-25 02:54:45.000000000 -0700
+++ engine/engine/maths/nmatrix.h 2005-07-25 15:04:43.000000000 -0700
@@ -284,8 +284,8 @@
*/
void makeIdentity() {
initialise(zero);
- for (unsigned long i = 0; i < nRows && i < nCols; i++)
- data[i][i] = one;
+ for (unsigned long i = 0; i < this->nRows && i < this->nCols; i++)
+ this->data[i][i] = one;
}
/**
@@ -298,8 +298,8 @@
* @param dest the row that will be added to.
*/
void addRow(unsigned long source, unsigned long dest) {
- for (unsigned long i = 0; i < nCols; i++)
- data[dest][i] += data[source][i];
+ for (unsigned long i = 0; i < this->nCols; i++)
+ this->data[dest][i] += this->data[source][i];
}
/**
* Adds the given number of copies of the given source row to
@@ -318,8 +318,8 @@
*/
void addRow(unsigned long source, unsigned long dest,
T copies) {
- for (unsigned long i = 0; i < nCols; i++)
- data[dest][i] += copies * data[source][i];
+ for (unsigned long i = 0; i < this->nCols; i++)
+ this->data[dest][i] += copies * this->data[source][i];
}
/**
* Adds the given source column to the given destination column.
@@ -331,8 +331,8 @@
* @param dest the column that will be added to.
*/
void addCol(unsigned long source, unsigned long dest) {
- for (unsigned long i = 0; i < nRows; i++)
- data[i][dest] += data[i][source];
+ for (unsigned long i = 0; i < this->nRows; i++)
+ this->data[i][dest] += this->data[i][source];
}
/**
* Adds the given number of copies of the given source column to
@@ -351,8 +351,8 @@
*/
void addCol(unsigned long source, unsigned long dest,
T copies) {
- for (unsigned long i = 0; i < nRows; i++)
- data[i][dest] += copies * data[i][source];
+ for (unsigned long i = 0; i < this->nRows; i++)
+ this->data[i][dest] += copies * this->data[i][source];
}
/**
* Multiplies the given row by the given factor.
@@ -366,8 +366,8 @@
* @param factor the factor by which to multiply the given row.
*/
void multRow(unsigned long row, T factor) {
- for (unsigned long i = 0; i < nCols; i++)
- data[row][i] *= factor;
+ for (unsigned long i = 0; i < this->nCols; i++)
+ this->data[row][i] *= factor;
}
/**
* Multiplies the given column by the given factor.
@@ -381,8 +381,8 @@
* @param factor the factor by which to multiply the given column.
*/
void multCol(unsigned long column, T factor) {
- for (unsigned long i = 0; i < nRows; i++)
- data[i][column] *= factor;
+ for (unsigned long i = 0; i < this->nRows; i++)
+ this->data[i][column] *= factor;
}
/**
@@ -399,14 +399,14 @@
* <tt>this * other</tt>.
*/
NMatrixRing<T>* operator * (const NMatrixRing<T>& other) const {
- NMatrixRing<T>* ans = new NMatrixRing<T>(nRows, other.nCols);
+ NMatrixRing<T>* ans = new NMatrixRing<T>(this->nRows, other.nCols);
unsigned long row, col, k;
- for (row = 0; row < nRows; row++)
+ for (row = 0; row < this->nRows; row++)
for (col = 0; col < other.nCols; col++) {
ans->data[row][col] = zero;
- for (k = 0; k < nCols; k++)
+ for (k = 0; k < this->nCols; k++)
ans->data[row][col] +=
- (data[row][k] * other.data[k][col]);
+ (this->data[row][k] * other.data[k][col]);
}
return ans;
}
--- engine/engine/maths/nvector.h.orig 2005-07-25 15:48:06.000000000 -0700
+++ engine/engine/maths/nvector.h 2005-07-25 15:48:34.000000000 -0700
@@ -39,6 +39,11 @@
namespace regina {
+ template <class T> class NVector;
+
+ template <class T> std::ostream& operator << (std::ostream& out,
+ const NVector<T>& vector);
+
/**
* \weakgroup maths
* @{
--- engine/engine/maths/nvectordense.h.orig 2005-07-25 15:49:11.000000000
-0700
+++ engine/engine/maths/nvectordense.h 2005-07-25 15:50:00.000000000 -0700
@@ -139,7 +139,7 @@
elements[i] -= other[i];
}
virtual void operator *= (const T& factor) {
- if (factor == one)
+ if (factor == this->one)
return;
for (unsigned i=0; i<vectorSize; i++)
elements[i] *= factor;
@@ -150,13 +150,13 @@
}
virtual void addCopies(const NVector<T>& other,
const T& multiple) {
- if (multiple == zero)
+ if (multiple == this->zero)
return;
- if (multiple == one) {
+ if (multiple == this->one) {
(*this) += other;
return;
}
- if (multiple == minusOne) {
+ if (multiple == this->minusOne) {
(*this) -= other;
return;
}
@@ -169,13 +169,13 @@
}
virtual void subtractCopies(const NVector<T>& other,
const T& multiple) {
- if (multiple == zero)
+ if (multiple == this->zero)
return;
- if (multiple == one) {
+ if (multiple == this->one) {
(*this) -= other;
return;
}
- if (multiple == minusOne) {
+ if (multiple == this->minusOne) {
(*this) += other;
return;
}
--- engine/engine/utilities/nproperty.h.orig 2005-07-25 15:47:20.000000000
-0700
+++ engine/engine/utilities/nproperty.h 2005-07-25 15:50:59.000000000 -0700
@@ -258,7 +258,7 @@
* @return the current value of this property.
*/
QueryType value() const {
- return value_;
+ return this->value_;
}
/**
@@ -271,10 +271,10 @@
QueryType operator = (InitType newValue) {
Storage<T>::clear();
- value_ = newValue;
- known_ = true;
+ this->value_ = newValue;
+ this->known_ = true;
- return value_;
+ return this->value_;
}
/**
@@ -295,8 +295,8 @@
// the value shouldn't be copied directly (e.g., with
// StoreManagedPtr) then we'll get a compile error.
if (newValue.known_)
- value_ = newValue.value();
- known_ = newValue.known_;
+ this->value_ = newValue.value();
+ this->known_ = newValue.known_;
return *this;
}
--- engine/engine/maths/nvectormatrix.h.orig 2005-07-25 15:51:53.000000000
-0700
+++ engine/engine/maths/nvectormatrix.h 2005-07-25 15:52:35.000000000 -0700
@@ -153,10 +153,10 @@
NVectorMatrix<T>(matrix, whichRow) {
}
virtual unsigned size() const {
- return source.columns();
+ return this->source.columns();
}
virtual const T& operator[](unsigned index) const {
- return source.entry(rowCol, index);
+ return this->source.entry(this->rowCol, index);
}
};
@@ -185,10 +185,10 @@
NVectorMatrix<T>(matrix, whichCol) {
}
virtual unsigned size() const {
- return source.rows();
+ return this->source.rows();
}
virtual const T& operator[](unsigned index) const {
- return source.entry(index, rowCol);
+ return this->source.entry(index, this->rowCol);
}
};
--- engine/engine/progress/nprogress.h.orig 2005-07-25 15:53:18.000000000
-0700
+++ engine/engine/progress/nprogress.h 2005-07-25 15:53:18.000000000 -0700
@@ -369,7 +369,7 @@
inline long NProgress::totalCPUTime() const {
MutexLock(this);
return (finished ? (endCPU - startCPU) / CLOCKS_PER_SEC : 0);
-};
+}
// Inline functions for NProgressFinished
--- engine/engine/maths/nvectorunit.h.orig 2005-07-25 15:53:31.000000000
-0700
+++ engine/engine/maths/nvectorunit.h 2005-07-25 15:53:49.000000000 -0700
@@ -98,8 +98,8 @@
vectorSize(newVectorSize), direction(coordinate) {
}
virtual NVector<T>* clone() const {
- NVector<T>* ans = new NVectorDense<T>(vectorSize, zero);
- ans->setElement(direction, one);
+ NVector<T>* ans = new NVectorDense<T>(vectorSize, this->zero);
+ ans->setElement(direction, this->one);
return ans;
}
virtual unsigned size() const {
@@ -107,9 +107,9 @@
}
virtual const T& operator[](unsigned index) const {
if (index == direction)
- return one;
+ return this->one;
else
- return zero;
+ return this->zero;
}
virtual void setElement(unsigned, const T&) {
throw NVectorUnit_Illegal_Modification();
@@ -134,10 +134,10 @@
throw NVectorUnit_Illegal_Modification();
}
virtual T norm() const {
- return one;
+ return this->one;
}
virtual T elementSum() const {
- return one;
+ return this->one;
}
virtual void addCopies(const NVector<T>&, const T&) {
throw NVectorUnit_Illegal_Modification();
--- engine/engine/split/nsigisomorphism.h.orig 2005-07-25 16:15:19.000000000
-0700
+++ engine/engine/split/nsigisomorphism.h 2005-07-25 16:15:31.000000000
-0700
@@ -183,6 +183,9 @@
NSigPartialIsomorphism(const NSigPartialIsomorphism& base,
unsigned newLabels, unsigned newCycles);
+ friend struct ShorterCycle;
+
+
/**
* A comparison function for use with the Standard Template
* Library.
@@ -195,7 +198,7 @@
* It is irrelevant which cycle is mapped to appear before the other
* in the sequence of cycles belonging to the image signature.
*/
- friend struct ShorterCycle {
+ struct ShorterCycle {
const NSignature& sig;
/**< The signature containing the cycles to examine. */
const NSigPartialIsomorphism& iso;
--- engine/engine/surfaces/nsanstandard.tcc.orig 2005-07-25
16:23:26.000000000 -0700
+++ engine/engine/surfaces/nsanstandard.tcc 2005-07-25 16:23:35.000000000
-0700
@@ -29,6 +29,7 @@
/* To be included from nsanstandard.h. */
#include "maths/nvectorunit.h"
+#include "triangulation/ntriangulation.h"
namespace regina {
--- engine/engine/surfaces/nsstandard.tcc.orig 2005-07-25 16:28:26.000000000
-0700
+++ engine/engine/surfaces/nsstandard.tcc 2005-07-25 16:28:27.000000000
-0700
@@ -29,6 +29,7 @@
/* To be included from nsstandard.h. */
#include "maths/nvectorunit.h"
+#include "triangulation/ntriangulation.h"
namespace regina {
--- engine/engine/maths/nmatrixfield.h.orig 2005-07-25 16:36:30.000000000
-0700
+++ engine/engine/maths/nmatrixfield.h 2005-07-25 16:38:45.000000000 -0700
@@ -94,8 +94,8 @@
* @param factor the factor by which to divide the given row.
*/
void divRow(unsigned long row, T factor) {
- for (unsigned long i = 0; i < nCols; i++)
- data[row][i] /= factor;
+ for (unsigned long i = 0; i < this->nCols; i++)
+ this->data[row][i] /= factor;
}
/**
* Divides the given column by the given factor.
@@ -109,8 +109,8 @@
* @param factor the factor by which to divide the given column.
*/
void divCol(unsigned long column, T factor) {
- for (unsigned long i = 0; i < nRows; i++)
- data[i][column] /= factor;
+ for (unsigned long i = 0; i < this->nRows; i++)
+ this->data[i][column] /= factor;
}
/**
@@ -127,19 +127,19 @@
* M will be a square matrix of size rows().
*/
NMatrixField<T>* diagonaliseRow() {
- NMatrixField<T>* ans = new NMatrixField(nRows, nRows);
+ NMatrixField<T>* ans = new NMatrixField(this->nRows, this->nRows);
ans->makeIdentity();
unsigned long doneRow = 0;
unsigned long doneCol = 0;
unsigned long row;
- while (doneCol < nCols && doneRow < nRows) {
+ while (doneCol < this->nCols && doneRow < this->nRows) {
// Is there a non-zero value in this column?
row = doneRow;
- while (row < nRows && data[row][doneCol] == zero)
+ while (row < this->nRows && this->data[row][doneCol] ==
this->zero)
row++;
- if (row == nRows) {
+ if (row == this->nRows) {
// All zeroes in this column.
doneCol++;
continue;
@@ -147,22 +147,22 @@
// Move the non-zero to the top.
if (row != doneRow) {
ans->swapRows(row, doneRow);
- swapRows(row, doneRow);
+ this->swapRows(row, doneRow);
}
// Make the non-zero entry one.
- if (! (data[doneRow][doneCol] == one)) {
- ans->divRow(doneRow, data[doneRow][doneCol]);
- divRow(doneRow, data[doneRow][doneCol]);
+ if (! (this->data[doneRow][doneCol] == this->one)) {
+ ans->divRow(doneRow, this->data[doneRow][doneCol]);
+ divRow(doneRow, this->data[doneRow][doneCol]);
}
// Make every other entry in this column zero.
- for (row = 0; row < nRows; row++) {
+ for (row = 0; row < this->nRows; row++) {
if (row == doneRow)
continue;
- if (! (data[row][doneCol] == zero)) {
- ans->addRow(doneRow, row, -data[row][doneCol]);
- addRow(doneRow, row, -data[row][doneCol]);
+ if (! (this->data[row][doneCol] == this->zero)) {
+ ans->addRow(doneRow, row, -this->data[row][doneCol]);
+ this->addRow(doneRow, row, -this->data[row][doneCol]);
}
}
--- engine/engine/surfaces/nsquad.tcc.orig 2005-07-25 16:39:13.000000000
-0700
+++ engine/engine/surfaces/nsquad.tcc 2005-07-25 16:39:15.000000000 -0700
@@ -29,5 +29,6 @@
/* To be included from nsquad.h. */
#include "maths/nvectorunit.h"
+#include "triangulation/ntriangulation.h"
namespace regina {
--- engine/engine/surfaces/nnormalsurfacelist.cpp.orig 2005-07-25
16:02:23.000000000 -0700
+++ engine/engine/surfaces/nnormalsurfacelist.cpp 2005-07-25
17:22:37.000000000 -0700
@@ -41,11 +41,11 @@
#define __FLAVOUR_REGISTRY_BODY
-const int NNormalSurfaceList::STANDARD = 0;
-const int NNormalSurfaceList::AN_STANDARD = 100;
-const int NNormalSurfaceList::QUAD = 1;
-const int NNormalSurfaceList::EDGE_WEIGHT = 200;
-const int NNormalSurfaceList::FACE_ARCS = 201;
+// const int NNormalSurfaceList::STANDARD = 0;
+// const int NNormalSurfaceList::AN_STANDARD = 100;
+// const int NNormalSurfaceList::QUAD = 1;
+// const int NNormalSurfaceList::EDGE_WEIGHT = 200;
+// const int NNormalSurfaceList::FACE_ARCS = 201;
#define REGISTER_FLAVOUR(id_name, class, n, a, t) \
case NNormalSurfaceList::id_name: \
--- engine/engine/surfaces/nnormalsurfacelist.h.orig 2005-07-25
17:22:45.000000000 -0700
+++ engine/engine/surfaces/nnormalsurfacelist.h 2005-07-25 17:22:58.000000000
-0700
@@ -80,20 +80,20 @@
public:
static const int packetType;
- static const int STANDARD;
+ static const int STANDARD = 0;
/**< Represents standard triangle-quad coordinates for
* normal surfaces. */
- static const int AN_STANDARD;
+ static const int AN_STANDARD = 100;
/**< Represents standard triangle-quad-oct coordinates
* for almost normal surfaces. */
- static const int QUAD;
+ static const int QUAD = 1;
/**< Represents quad coordinates for normal surfaces. */
- static const int EDGE_WEIGHT;
+ static const int EDGE_WEIGHT = 200;
/**< Represents edge weight coordinates for normal surfaces.
* This flavour is for representation only; surface
* vectors and lists of this flavour cannot be created. */
- static const int FACE_ARCS;
+ static const int FACE_ARCS = 201;
/**< Represents face arc coordinates for normal surfaces.
* This flavour is for representation only; surface
* vectors and lists of this flavour cannot be created. */
--- kdeui/src/common/coordinates.h.orig 2005-07-25 17:41:23.000000000 -0700
+++ kdeui/src/common/coordinates.h 2005-07-25 17:41:23.000000000 -0700
@@ -82,6 +82,6 @@
*/
regina::NLargeInteger getCoordinate(int coordSystem,
const regina::NNormalSurface& surface, unsigned long whichCoord);
-};
+}
#endif
--- kdeui/src/part/reginapart.h.orig 2005-07-25 17:47:10.000000000 -0700
+++ kdeui/src/part/reginapart.h 2005-07-25 17:47:10.000000000 -0700
@@ -41,7 +41,7 @@
namespace regina {
class NPacket;
-};
+}
class KAboutData;
class KInstance;
--- kdeui/src/part/foreign/packetimporter.h.orig 2005-07-25
17:48:55.000000000 -0700
+++ kdeui/src/part/foreign/packetimporter.h 2005-07-25 17:48:56.000000000
-0700
@@ -39,7 +39,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* An object responsible for importing a packet tree from a foreign file
--- kdeui/src/part/packetchooser.h.orig 2005-07-25 17:51:21.000000000 -0700
+++ kdeui/src/part/packetchooser.h 2005-07-25 17:51:21.000000000 -0700
@@ -42,7 +42,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* A widget through which a single packet can be selected from a
--- kdeui/src/part/foreign/exportdialog.h.orig 2005-07-25 17:52:16.000000000
-0700
+++ kdeui/src/part/foreign/exportdialog.h 2005-07-25 17:52:16.000000000
-0700
@@ -41,7 +41,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* A dialog used to select a packet or packet subtree to export.
--- kdeui/src/part/foreign/importdialog.h.orig 2005-07-25 17:52:59.000000000
-0700
+++ kdeui/src/part/foreign/importdialog.h 2005-07-25 17:52:59.000000000
-0700
@@ -42,7 +42,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* A dialog used to inserted previously imported data into the packet tree.
--- kdeui/src/part/foreign/packetexporter.h.orig 2005-07-25
17:53:19.000000000 -0700
+++ kdeui/src/part/foreign/packetexporter.h 2005-07-25 17:53:19.000000000
-0700
@@ -40,7 +40,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* An object responsible for exporting a packet or packet subtree to a
--- kdeui/src/part/packettypes/eltmovedialog.h.orig 2005-07-25
17:56:02.000000000 -0700
+++ kdeui/src/part/packettypes/eltmovedialog.h 2005-07-25 17:56:02.000000000
-0700
@@ -43,7 +43,7 @@
namespace regina {
class NTriangulation;
-};
+}
/**
* A dialog used to select and perform an elementary move on a
--- kdeui/src/part/packettypes/gaprunner.h.orig 2005-07-25 17:56:38.000000000
-0700
+++ kdeui/src/part/packettypes/gaprunner.h 2005-07-25 17:56:39.000000000
-0700
@@ -43,7 +43,7 @@
namespace regina {
class NGroupExpression;
class NGroupPresentation;
-};
+}
/**
* A dialog that handles communications with GAP in order to simplify a
--- kdeui/src/part/packettypes/nanglestructureitem.h.orig 2005-07-25
17:56:54.000000000 -0700
+++ kdeui/src/part/packettypes/nanglestructureitem.h 2005-07-25
17:56:55.000000000 -0700
@@ -39,7 +39,7 @@
namespace regina {
class NAngleStructure;
-};
+}
/**
* A list view item describing a single angle structure.
Diff finished. Mon Jul 25 17:56:56 2005
--- kdeui/src/part/packettypes/nanglestructureui.h.orig 2005-07-25
17:57:11.000000000 -0700
+++ kdeui/src/part/packettypes/nanglestructureui.h 2005-07-25
17:57:11.000000000 -0700
@@ -46,7 +46,7 @@
namespace regina {
class NAngleStructureList;
class NPacket;
-};
+}
/**
* A packet interface for viewing angle structure lists.
--- kdeui/src/part/packettypes/nscriptui.h.orig 2005-07-25 17:57:50.000000000
-0700
+++ kdeui/src/part/packettypes/nscriptui.h 2005-07-25 17:57:55.000000000
-0700
@@ -43,12 +43,12 @@
namespace KTextEditor {
class EditInterface;
class View;
-};
+}
namespace regina {
class NPacket;
class NScript;
-};
+}
/**
* A packet interface for viewing script packets.
--- kdeui/src/part/packettypes/nsurfacecoordinateitem.h.orig 2005-07-25
17:58:18.000000000 -0700
+++ kdeui/src/part/packettypes/nsurfacecoordinateitem.h 2005-07-25
17:58:19.000000000 -0700
@@ -38,7 +38,7 @@
namespace regina {
class NNormalSurface;
class NNormalSurfaceList;
-};
+}
/**
* A list view item describing a single normal surface.
--- kdeui/src/part/packettypes/nsurfacefilterprop.h.orig 2005-07-25
17:58:43.000000000 -0700
+++ kdeui/src/part/packettypes/nsurfacefilterprop.h 2005-07-25
17:58:43.000000000 -0700
@@ -46,7 +46,7 @@
namespace regina {
class NSurfaceFilterProperties;
class NPacket;
-};
+}
/**
* A packet interface for working with property-based surface filters.
--- kdeui/src/part/packettypes/nsurfacematchingitem.h.orig 2005-07-25
17:58:53.000000000 -0700
+++ kdeui/src/part/packettypes/nsurfacematchingitem.h 2005-07-25
17:58:53.000000000 -0700
@@ -38,7 +38,7 @@
namespace regina {
class NMatrixInt;
-};
+}
/**
* A list view item describing a single normal surface matching equation.
--- kdeui/src/part/packettypes/nsurfacematchingui.h.orig 2005-07-25
17:59:05.000000000 -0700
+++ kdeui/src/part/packettypes/nsurfacematchingui.h 2005-07-25
17:59:05.000000000 -0700
@@ -46,7 +46,7 @@
class NMatrixInt;
class NNormalSurfaceList;
class NPacket;
-};
+}
/**
* A surface list page for viewing matching equations.
--- kdeui/src/part/packettypes/ntextui.h.orig 2005-07-25 17:59:22.000000000
-0700
+++ kdeui/src/part/packettypes/ntextui.h 2005-07-25 17:59:23.000000000
-0700
@@ -38,12 +38,12 @@
namespace KTextEditor {
class EditInterface;
class View;
-};
+}
namespace regina {
class NPacket;
class NText;
-};
+}
/**
* A packet interface for viewing text packets.
--- kdeui/src/part/packettypes/ntrialgebra.h.orig 2005-07-25
17:59:31.000000000 -0700
+++ kdeui/src/part/packettypes/ntrialgebra.h 2005-07-25 17:59:31.000000000
-0700
@@ -45,7 +45,7 @@
namespace regina {
class NPacket;
class NTriangulation;
-};
+}
/**
* A triangulation page for viewing algebraic properties.
--- kdeui/src/part/packettypes/ntriangulationui.h.orig 2005-07-25
17:59:38.000000000 -0700
+++ kdeui/src/part/packettypes/ntriangulationui.h 2005-07-25
17:59:39.000000000 -0700
@@ -44,7 +44,7 @@
namespace regina {
class NTriangulation;
-};
+}
/**
* A packet interface for viewing triangulations.
--- kdeui/src/part/packettypes/ntricomposition.h.orig 2005-07-25
17:59:45.000000000 -0700
+++ kdeui/src/part/packettypes/ntricomposition.h 2005-07-25
17:59:46.000000000 -0700
@@ -49,7 +49,7 @@
class NPacket;
class NStandardTriangulation;
class NTriangulation;
-};
+}
/**
* A triangulation page for viewing the combinatorial composition.
--- kdeui/src/part/packettypes/ntrigluings.h.orig 2005-07-25
17:59:54.000000000 -0700
+++ kdeui/src/part/packettypes/ntrigluings.h 2005-07-25 17:59:54.000000000
-0700
@@ -44,7 +44,7 @@
namespace regina {
class NPacket;
class NTriangulation;
-};
+}
/**
* A triangulation page for editing face gluings.
--- kdeui/src/part/packettypes/ntriskeleton.h.orig 2005-07-25
17:59:58.000000000 -0700
+++ kdeui/src/part/packettypes/ntriskeleton.h 2005-07-25 17:59:58.000000000
-0700
@@ -42,7 +42,7 @@
namespace regina {
class NPacket;
class NTriangulation;
-};
+}
/**
* A triangulation page for viewing skeletal properties.
--- kdeui/src/part/packettypes/ntrisurfaces.h.orig 2005-07-25
18:00:34.000000000 -0700
+++ kdeui/src/part/packettypes/ntrisurfaces.h 2005-07-25 18:00:34.000000000
-0700
@@ -41,7 +41,7 @@
namespace regina {
class NPacket;
class NTriangulation;
-};
+}
/**
* A triangulation page for viewing normal surface properties.
--- kdeui/src/part/packettypes/skeletonwindow.h.orig 2005-07-25
18:00:42.000000000 -0700
+++ kdeui/src/part/packettypes/skeletonwindow.h 2005-07-25 18:00:43.000000000
-0700
@@ -50,7 +50,7 @@
class NFace;
class NTriangulation;
class NVertex;
-};
+}
/**
* A modeless dialog for viewing all skeletal objects of a particular
--- kdeui/src/common/coordinates.cpp.orig 2005-07-25 17:42:58.000000000
-0700
+++ kdeui/src/common/coordinates.cpp 2005-07-25 17:42:59.000000000 -0700
@@ -181,5 +181,5 @@
return (long)0;
}
-};
+}
--- kdeui/src/part/packettypes/nsurfacefiltercomb.h.orig 2005-07-25
17:58:29.000000000 -0700
+++ kdeui/src/part/packettypes/nsurfacefiltercomb.h 2005-07-25
17:58:29.000000000 -0700
@@ -44,7 +44,7 @@
namespace regina {
class NSurfaceFilterCombination;
class NPacket;
-};
+}
/**
* A packet interface for working with combination surface filters.
--- kdeui/src/part/progressdialogs.h.orig 2005-07-25 18:05:29.000000000
-0700
+++ kdeui/src/part/progressdialogs.h 2005-07-25 18:05:29.000000000 -0700
@@ -39,7 +39,7 @@
namespace regina {
class NProgressManager;
class NProgressNumber;
-};
+}
/**
* A dialog that interacts with the calculation engine progress class
--- kdeui/src/part/newpacketdialog.h.orig 2005-07-25 18:06:04.000000000
-0700
+++ kdeui/src/part/newpacketdialog.h 2005-07-25 18:06:05.000000000 -0700
@@ -43,7 +43,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* A dialog used to create a new packet.
--- kdeui/src/part/packetcreator.h.orig 2005-07-25 18:06:18.000000000 -0700
+++ kdeui/src/part/packetcreator.h 2005-07-25 18:06:18.000000000 -0700
@@ -37,7 +37,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* An interface component for creating a packet. Such interface
--- kdeui/src/part/packetmanager.h.orig 2005-07-25 18:06:32.000000000 -0700
+++ kdeui/src/part/packetmanager.h 2005-07-25 18:06:33.000000000 -0700
@@ -41,11 +41,11 @@
namespace KTextEditor {
class Document;
-};
+}
namespace regina {
class NPacket;
-};
+}
/**
* Provides a variety of routines for creating visual interfaces for
--- kdeui/src/part/packettreeview.h.orig 2005-07-25 18:06:39.000000000
-0700
+++ kdeui/src/part/packettreeview.h 2005-07-25 18:06:39.000000000 -0700
@@ -42,7 +42,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* A single item in a Regina packet tree.
--- kdeui/src/part/packetui.h.orig 2005-07-25 18:06:46.000000000 -0700
+++ kdeui/src/part/packetui.h 2005-07-25 18:06:48.000000000 -0700
@@ -53,7 +53,7 @@
namespace regina {
class NPacket;
-};
+}
/**
* A packet header, containing an appropriate icon and text title.
--- kdeui/src/part/packettypes/ncontainerui.h.orig 2005-07-25
18:16:04.000000000 -0700
+++ kdeui/src/part/packettypes/ncontainerui.h 2005-07-25 18:16:04.000000000
-0700
@@ -43,7 +43,7 @@
namespace regina {
class NContainer;
class NPacket;
-};
+}
/**
* A packet interface for viewing containers.
--- kdeui/src/part/packettypes/nnormalsurfaceui.h.orig 2005-07-25
18:21:31.000000000 -0700
+++ kdeui/src/part/packettypes/nnormalsurfaceui.h 2005-07-25
18:21:32.000000000 -0700
@@ -40,7 +40,7 @@
namespace regina {
class NNormalSurfaceList;
-};
+}
/**
* A packet interface for viewing normal surface lists.
--- kdeui/src/part/packettypes/nsurfacecoordinateui.h.orig 2005-07-25
18:21:50.000000000 -0700
+++ kdeui/src/part/packettypes/nsurfacecoordinateui.h 2005-07-25
18:21:51.000000000 -0700
@@ -54,7 +54,7 @@
class NPacket;
class NNormalSurfaceList;
class NSurfaceFilter;
-};
+}
/**
* A normal surface page for viewing surface coordinates.
--- kdeui/src/part/reginapart.cpp.orig 2005-07-25 18:38:35.000000000 -0700
+++ kdeui/src/part/reginapart.cpp 2005-07-25 18:38:37.000000000 -0700
@@ -55,7 +55,7 @@
#include <kparts/genericfactory.h>
typedef KParts::GenericFactory<ReginaPart> ReginaPartFactory;
-K_EXPORT_COMPONENT_FACTORY(libreginapart, ReginaPartFactory);
+K_EXPORT_COMPONENT_FACTORY(libreginapart, ReginaPartFactory)
ReginaPart::ReginaPart(QWidget *parentWidget, const char *widgetName,
QObject *parent, const char *name, const QStringList& /*args*/) :
--- python/algebra/nabeliangroup.cpp.orig 2005-07-25 18:44:44.000000000
-0700
+++ python/algebra/nabeliangroup.cpp 2005-07-25 18:44:45.000000000 -0700
@@ -50,9 +50,9 @@
const = &NAbelianGroup::getTorsionRank;
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_addRank,
- NAbelianGroup::addRank, 0, 1);
+ NAbelianGroup::addRank, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_addTorsionElement,
- NAbelianGroup::addTorsionElement, 1, 2);
+ NAbelianGroup::addTorsionElement, 1, 2)
void addTorsionElements_dict(NAbelianGroup& g,
boost::python::list elements) {
--- python/algebra/ngrouppresentation.cpp.orig 2005-07-25 18:45:24.000000000
-0700
+++ python/algebra/ngrouppresentation.cpp 2005-07-25 18:45:25.000000000
-0700
@@ -47,11 +47,11 @@
unsigned long) = &NGroupExpression::getTerm;
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_simplify,
- NGroupExpression::simplify, 0, 1);
+ NGroupExpression::simplify, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_substitute,
- NGroupExpression::substitute, 2, 3);
+ NGroupExpression::substitute, 2, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_addGenerator,
- NGroupPresentation::addGenerator, 0, 1);
+ NGroupPresentation::addGenerator, 0, 1)
object getTerms_list(const NGroupExpression& e) {
boost::python::list ans;
--- python/file/nxmlfile.cpp.orig 2005-07-25 18:52:22.000000000 -0700
+++ python/file/nxmlfile.cpp 2005-07-25 18:52:22.000000000 -0700
@@ -34,7 +34,7 @@
namespace {
BOOST_PYTHON_FUNCTION_OVERLOADS(OL_writeXMLFile,
- regina::writeXMLFile, 2, 3);
+ regina::writeXMLFile, 2, 3)
}
void addNXMLFile() {
--- python/foreign/dehydration.cpp.orig 2005-07-25 18:52:52.000000000 -0700
+++ python/foreign/dehydration.cpp 2005-07-25 18:52:52.000000000 -0700
@@ -34,7 +34,7 @@
namespace {
BOOST_PYTHON_FUNCTION_OVERLOADS(OL_readDehydrationList,
- regina::readDehydrationList, 1, 4);
+ regina::readDehydrationList, 1, 4)
}
void addDehydration() {
--- python/maths/nmatrixint.cpp.orig 2005-07-25 18:52:58.000000000 -0700
+++ python/maths/nmatrixint.cpp 2005-07-25 18:52:59.000000000 -0700
@@ -41,9 +41,9 @@
regina::NLargeInteger) = &NMatrixInt::addCol;
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_addRow,
- NMatrixInt::addRow, 2, 3);
+ NMatrixInt::addRow, 2, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_addCol,
- NMatrixInt::addCol, 2, 3);
+ NMatrixInt::addCol, 2, 3)
}
void addNMatrixInt() {
--- python/packet/npacket.cpp.orig 2005-07-25 18:53:14.000000000 -0700
+++ python/packet/npacket.cpp 2005-07-25 18:53:16.000000000 -0700
@@ -41,13 +41,13 @@
&NPacket::findPacketLabel;
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_moveUp,
- NPacket::moveUp, 0, 1);
+ NPacket::moveUp, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_moveDown,
- NPacket::moveDown, 0, 1);
+ NPacket::moveDown, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_nextTreePacket,
- NPacket::nextTreePacket, 0, 1);
+ NPacket::nextTreePacket, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_clone,
- NPacket::clone, 0, 2);
+ NPacket::clone, 0, 2)
void insertChildFirst_own(NPacket& parent, std::auto_ptr<NPacket> child) {
parent.insertChildFirst(child.get());
--- python/triangulation/ntriangulation.cpp.orig 2005-07-25
18:53:25.000000000 -0700
+++ python/triangulation/ntriangulation.cpp 2005-07-25 18:53:34.000000000
-0700
@@ -43,29 +43,29 @@
&NTriangulation::twoZeroMove;
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_simplifyToLocalMinimum,
- NTriangulation::simplifyToLocalMinimum, 0, 1);
+ NTriangulation::simplifyToLocalMinimum, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_threeTwoMove,
- NTriangulation::threeTwoMove, 1, 3);
+ NTriangulation::threeTwoMove, 1, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_twoThreeMove,
- NTriangulation::twoThreeMove, 1, 3);
+ NTriangulation::twoThreeMove, 1, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_fourFourMove,
- NTriangulation::fourFourMove, 2, 4);
+ NTriangulation::fourFourMove, 2, 4)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_twoZeroMove,
- NTriangulation::twoZeroMove, 1, 3);
+ NTriangulation::twoZeroMove, 1, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_twoOneMove,
- NTriangulation::twoOneMove, 2, 4);
+ NTriangulation::twoOneMove, 2, 4)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_openBook,
- NTriangulation::openBook, 1, 3);
+ NTriangulation::openBook, 1, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_shellBoundary,
- NTriangulation::shellBoundary, 1, 3);
+ NTriangulation::shellBoundary, 1, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_collapseEdge,
- NTriangulation::collapseEdge, 1, 3);
+ NTriangulation::collapseEdge, 1, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_splitIntoComponents,
- NTriangulation::splitIntoComponents, 0, 2);
+ NTriangulation::splitIntoComponents, 0, 2)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_connectedSumDecomposition,
- NTriangulation::connectedSumDecomposition, 0, 2);
+ NTriangulation::connectedSumDecomposition, 0, 2)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_idealToFinite,
- NTriangulation::idealToFinite, 0, 1);
+ NTriangulation::idealToFinite, 0, 1)
void simplifiedFundamentalGroup_own(NTriangulation& tri,
std::auto_ptr<regina::NGroupPresentation> group) {
--- python/utilities/nmpi.cpp.orig 2005-07-25 18:53:46.000000000 -0700
+++ python/utilities/nmpi.cpp 2005-07-25 18:53:46.000000000 -0700
@@ -34,7 +34,7 @@
namespace {
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(OL_stringValue,
- NLargeInteger::stringValue, 0, 1);
+ NLargeInteger::stringValue, 0, 1)
}
void addNLargeInteger() {
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-quack+roar.cs.berkeley.edu
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
---------------------------------------
Received: (at 319993-close) by bugs.debian.org; 12 Oct 2005 05:27:13 +0000
>From [EMAIL PROTECTED] Tue Oct 11 22:27:13 2005
Return-path: <[EMAIL PROTECTED]>
Received: from vscan02.westnet.com.au [203.10.1.132]
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1EPZ8y-0003k7-00; Tue, 11 Oct 2005 22:27:13 -0700
Received: from localhost (localhost.localdomain [127.0.0.1])
by localhost (Postfix) with ESMTP id 9A6F911B11A
for <[EMAIL PROTECTED]>; Wed, 12 Oct 2005 13:26:41 +0800 (WST)
Received: from vscan02.westnet.com.au ([127.0.0.1])
by localhost (vscan02.westnet.com.au [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 02144-01 for <[EMAIL PROTECTED]>;
Wed, 12 Oct 2005 13:26:41 +0800 (WST)
Received: from localhost.localdomain (dsl-202-173-183-137.vic.westnet.com.au
[202.173.183.137])
(using TLSv1 with cipher AES256-SHA (256/256 bits))
(No client certificate requested)
by vscan02.westnet.com.au (Postfix) with ESMTP id 61D69118B2B
for <[EMAIL PROTECTED]>; Wed, 12 Oct 2005 13:26:41 +0800 (WST)
Received: from bab by localhost.localdomain with local (Exim 4.50)
id 1EPZ8F-00019g-FI
for [EMAIL PROTECTED]; Wed, 12 Oct 2005 15:26:27 +1000
Date: Wed, 12 Oct 2005 15:26:27 +1000
From: Ben Burton <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: Closing regina-normal FTBFS
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
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=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
Package: regina-normal
Version: 4.2.1-1
Hi.. I just realised that this bug was never closed when version 4.2.1 was
uploaded. This was the first version built against g++-4.0, and all of
the g++-4.0 incompatibilities were fixed.
Ben.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
