28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2012-12-05 14:29:02.523487457 +0100
|
||
|
|
Upstream: dead?
|
||
|
|
|
||
|
|
build: resolve compile error due to doubly-defined variable
|
||
|
|
|
||
|
|
[ 42s] g++ -DPACKAGE_NAME=\"gfan\" -DPACKAGE_TARNAME=\"gfan\" -DPACKAGE_VERSION=\"0.5\" -DPACKAGE_STRING=\"gfan\ 0.5\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"gfan\" -DVERSION=\"0.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -DGMPRATIONAL -Wuninitialized -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -Wno-sign-compare -Wno-reorder -Wno-unused -Wno-unused-result -c -o app_normalfancleanup.o app_normalfancleanup.cpp
|
||
|
|
[ 42s] app_minkowski.cpp: In member function 'virtual int MinkowskiApplication::main()':
|
||
|
|
[ 42s] app_minkowski.cpp:163:17: error: redeclaration of 'int i'
|
||
|
|
[ 42s] app_minkowski.cpp:134:40: error: 'std::list<Vektor<int> >::const_iterator i' previously declared here
|
||
|
|
---
|
||
|
|
app_minkowski.cpp | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
Index: gfan0.5/app_minkowski.cpp
|
||
|
|
===================================================================
|
||
|
|
--- gfan0.5.orig/app_minkowski.cpp
|
||
|
|
+++ gfan0.5/app_minkowski.cpp
|
||
|
|
@@ -160,8 +160,6 @@ public:
|
||
|
|
//log0 fprintf(Stderr,"4");
|
||
|
|
f.insert(c);
|
||
|
|
//log0 fprintf(Stderr,"5\n");
|
||
|
|
- static int i;
|
||
|
|
- //log0 fprintf(Stderr,"inserted:%i\n",++i);
|
||
|
|
}
|
||
|
|
log1 fprintf(Stderr,"Resolving symmetries.\n");
|
||
|
|
|