ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/classlib-3.1.2-gcc46.patch

Comparing COMP/CMSDIST/classlib-3.1.2-gcc46.patch (file contents):
Revision 1.3 by eulisse, Wed Aug 31 13:30:57 2011 UTC vs.
Revision 1.4 by eulisse, Wed Aug 31 13:36:40 2011 UTC

#	Line 10 | Line 10 | diff -Naur orig.classlib-3.1.2/classlib/
10		namespace lat {
11
12		/** Buffer for reads and writes to a seekable backing store.
13	+	diff --git a/src/utils/Signal.cpp b/src/utils/Signal.cpp
14	+	index 7fcef14..72b226e 100644
15	+	--- a/src/utils/Signal.cpp
16	+	+++ b/src/utils/Signal.cpp
17	+	@@ -318,7 +318,7 @@ Signal::queue (pid_t process, int sig, int value /* = 0 */)
18	+	process = 0; // silence unused warning
19	+	sig = 0;     // silence unused warning
20	+	value = 0;   // silence unused warning
21	+	-    return 0;
22	+	+    return process + sig + (long long) value;
23	+	#endif
24	+	}
25	+
26	+	@@ -335,7 +335,7 @@ Signal::queue (pid_t process, int sig, void *value)
27	+	process = 0; // silence unused warning
28	+	sig = 0;     // silence unused warning
29	+	value = 0;   // silence unused warning
30	+	-    return 0;
31	+	+    return process + sig + (long long) value;
32	+	#endif
33	+	}
34	+
35	+	@@ -350,7 +350,7 @@ Signal::queue (int sig, int value /* = 0 */)
36	+	#else
37	+	sig = 0;   // silence unused warning
38	+	value = 0; // silence unused warning
39	+	-    return 0;
40	+	+    return sig + (long long) value;
41	+	#endif
42	+	}
43	+
44	+	@@ -365,7 +365,7 @@ Signal::queue (int sig, void *value)
45	+	#else
46	+	sig = 0;   // silence unused warning
47	+	value = 0; // silence unused warning
48	+	-    return 0;
49	+	+    return sig + (long long)value;
50	+	#endif
51	+	}
52	+
53	+	@@ -452,7 +452,7 @@ Signal::wait (const sigset_t *mask,
54	+	mask = 0;  // silence unused warning
55	+	info = 0;  // silence unused warning
56	+	msecs = 0; // silence unused warning
57	+	-    return 0;
58	+	+    return (long long) mask + (long long)info + msecs;
59	+	#endif
60	+	}
61	+
62	+	diff --git a/classlib/iobase/DirIterator.h b/classlib/iobase/DirIterator.h
63	+	index 623f1e1..9b52cb2 100644
64	+	--- a/classlib/iobase/DirIterator.h
65	+	+++ b/classlib/iobase/DirIterator.h
66	+	@@ -49,7 +49,7 @@ class Filename;
67	+
68	+	The end indicator for the iteration range is the default
69	+	constructed iterator.  */
70	+	-class DirIterator : public std::iterator<std::input_iterator_tag, std::string, ptrdiff_t>
71	+	+class DirIterator : public std::iterator<std::input_iterator_tag, std::string, std::ptrdiff_t>
72	+	{
73	+	public:
74	+	typedef std::input_iterator_tag    iterator_category;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines