File: rangecheck.patch

package info (click to toggle)
waili 19990723-22.2
  • links: PTS
  • area: main
  • in suites: bookworm
  • size: 2,564 kB
  • sloc: cpp: 9,964; ansic: 273; makefile: 208; sh: 74
file content (22 lines) | stat: -rw-r--r-- 1,012 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Description: FTBFS with GCC 4.2: uses removed minimum/maximum operator
Author: ???
Bug-Debian: http://bugs.debian.org/385523
Description: FTBFS: Rangecheck.C:218: error: expected primary-expression before '?' token
Author: Sebastian Bober <sbober@servercare.de>
Bug-Debian: http://bugs.debian.org/441493

--- waili-19990723.orig/test/Rangecheck.C
+++ waili-19990723/test/Rangecheck.C
@@ -213,9 +213,9 @@ int main(int argc, char *argv[])
 	Die("The number of levels must be equal to or greather than 1\n");
 
     wavelet = Wavelet::CreateCDF(np, nd);
-    u_int fstart = wavelet->GetGStart() <? wavelet->GetHStart();
-    u_int fend = wavelet->GetGEnd() >? wavelet->GetHEnd();
-    u_int limit = (-fstart >? fend)+1;
+    u_int fstart = std::min(wavelet->GetGStart() , wavelet->GetHStart());
+    u_int fend = std::max(wavelet->GetGEnd() , wavelet->GetHEnd());
+    u_int limit = ( (-fstart > fend) ? -fstart : fend )+1;
 #if 0
     u_int start = fstart, end = fend;
     for (u_int i = 1; i < numlevels; i++) {