forked from cms-sw/cmsdist
-
Notifications
You must be signed in to change notification settings - Fork 0
/
classlib-3.1.3-gcc46.patch
62 lines (56 loc) · 1.92 KB
/
classlib-3.1.3-gcc46.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
diff --git a/src/utils/Signal.cpp b/src/utils/Signal.cpp
index 7fcef14..72b226e 100644
--- a/src/utils/Signal.cpp
+++ b/src/utils/Signal.cpp
@@ -318,7 +318,7 @@ Signal::queue (pid_t process, int sig, int value /* = 0 */)
process = 0; // silence unused warning
sig = 0; // silence unused warning
value = 0; // silence unused warning
- return 0;
+ return process + sig + (long long) value;
#endif
}
@@ -335,7 +335,7 @@ Signal::queue (pid_t process, int sig, void *value)
process = 0; // silence unused warning
sig = 0; // silence unused warning
value = 0; // silence unused warning
- return 0;
+ return process + sig + (long long) value;
#endif
}
@@ -350,7 +350,7 @@ Signal::queue (int sig, int value /* = 0 */)
#else
sig = 0; // silence unused warning
value = 0; // silence unused warning
- return 0;
+ return sig + (long long) value;
#endif
}
@@ -365,7 +365,7 @@ Signal::queue (int sig, void *value)
#else
sig = 0; // silence unused warning
value = 0; // silence unused warning
- return 0;
+ return sig + (long long)value;
#endif
}
@@ -452,7 +452,7 @@ Signal::wait (const sigset_t *mask,
mask = 0; // silence unused warning
info = 0; // silence unused warning
msecs = 0; // silence unused warning
- return 0;
+ return (long long) mask + (long long)info + msecs;
#endif
}
diff --git a/classlib/iobase/DirIterator.h b/classlib/iobase/DirIterator.h
index 623f1e1..9b52cb2 100644
--- a/classlib/iobase/DirIterator.h
+++ b/classlib/iobase/DirIterator.h
@@ -49,7 +49,7 @@ class Filename;
The end indicator for the iteration range is the default
constructed iterator. */
-class DirIterator : public std::iterator<std::input_iterator_tag, std::string, ptrdiff_t>
+class DirIterator : public std::iterator<std::input_iterator_tag, std::string, std::ptrdiff_t>
{
public:
typedef std::input_iterator_tag iterator_category;