Commit 63d46407 authored by gregor herrmann's avatar gregor herrmann

Imported Debian patch 3.3.4-3

parent 29cc5c57
ifrit (3.3.4-3) unstable; urgency=low
* QA upload.
* Fix "ftbfs with GCC-4.7": add patch 02-gcc-4.7.diff:
declare SortWorker before using it.
(Closes: #667207)
* debian/rules: add build-{arch,indep} targets.
-- gregor herrmann <gregoa@debian.org> Wed, 02 May 2012 18:10:13 +0200
ifrit (3.3.4-2) unstable; urgency=low
* QA upload.
......
Description: move SortWorker declaration before usage in Sort
otherwise we see a build failure with gcc 4.7
Origin: vendor
Bug-Debian: http://bugs.debian.org/667207
Forwarded: no
Author: gregor herrmann <gregoa@debian.org>
Last-Update: 2012-05-02
--- a/core/iparticlesplitter.cpp
+++ b/core/iparticlesplitter.cpp
@@ -106,22 +106,6 @@
#define SWAP(i1,i2) { SAVE(1,i1); MOVE(i1,i2); RESTORE(i2,1); }
//
-// Do our own quick sort for efficiency reason (based on a Java code by Denis Ahrens)
-//
-
-template<class T>
-void Sort(iParticleSplitter *me, vtkIdType n, int ncom, int attSort, T *Points, float *Atts, float* Nrms)
-{
- T poi1[3];
- float nrm1[3];
- float *att1; att1 = new float[ncom]; IERROR_ASSERT(att1);
-
- SortWorker(me,0,n-1,ncom,attSort,Points,Atts,Nrms,poi1,att1,nrm1);
-
- delete [] att1;
-}
-
-//
// Recursive worker
//
template<class T>
@@ -179,6 +163,22 @@
}
}
+//
+// Do our own quick sort for efficiency reason (based on a Java code by Denis Ahrens)
+//
+
+template<class T>
+void Sort(iParticleSplitter *me, vtkIdType n, int ncom, int attSort, T *Points, float *Atts, float* Nrms)
+{
+ T poi1[3];
+ float nrm1[3];
+ float *att1; att1 = new float[ncom]; IERROR_ASSERT(att1);
+
+ SortWorker(me,0,n-1,ncom,attSort,Points,Atts,Nrms,poi1,att1,nrm1);
+
+ delete [] att1;
+}
+
};
01-gcc-4.3.diff
02-gcc-4.7.diff
......@@ -20,7 +20,9 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
build: build-stamp
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
build-stamp: $(QUILT_STAMPFN)
dh_testdir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment