|
308
|
1 |
--- gnome-commander-1.2.4/configure.in.orig 2007-06-12 10:43:09.594467068 +0100
|
|
|
2 |
+++ gnome-commander-1.2.4/configure.in 2007-06-12 10:44:53.690289562 +0100
|
|
|
3 |
@@ -19,6 +19,13 @@
|
|
|
4 |
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
+dnl Add -Wall to CFLAGS when using gcc
|
|
|
8 |
+AC_SUBST(GCC_WARNINGS)
|
|
|
9 |
+GCC_WARNINGS=
|
|
|
10 |
+if test "x$GCC" = "xyes"; then
|
|
|
11 |
+ GCC_WARNINGS="-Wall"
|
|
|
12 |
+fi
|
|
|
13 |
+
|
|
|
14 |
dnl ===================
|
|
|
15 |
dnl Gettext stuff
|
|
|
16 |
dnl ===================
|
|
|
17 |
--- gnome-commander-1.2.4/libgcmd/Makefile.am.orig 2007-06-12 10:48:00.522639516 +0100
|
|
|
18 |
+++ gnome-commander-1.2.4/libgcmd/Makefile.am 2007-06-12 10:48:05.639412425 +0100
|
|
|
19 |
@@ -1,6 +1,6 @@
|
|
|
20 |
## Process this file with automake to produce Makefile.in
|
|
|
21 |
|
|
|
22 |
-AM_CPPFLAGS = -Wall \
|
|
|
23 |
+AM_CPPFLAGS = $(GCC_WARNINGS) \
|
|
|
24 |
$(GNOMEUI_CFLAGS) \
|
|
|
25 |
$(GNOMEVFS_CFLAGS)
|
|
|
26 |
|
|
|
27 |
--- gnome-commander-1.2.4/plugins/cvs/Makefile.am.orig 2007-06-12 10:47:22.046730441 +0100
|
|
|
28 |
+++ gnome-commander-1.2.4/plugins/cvs/Makefile.am 2007-06-12 10:47:27.314987728 +0100
|
|
|
29 |
@@ -3,7 +3,7 @@
|
|
307
|
30 |
.l.c:
|
|
|
31 |
$(LEXCOMPILE) $<
|
|
|
32 |
|
|
|
33 |
-AM_CPPFLAGS = -Wall \
|
|
308
|
34 |
+AM_CPPFLAGS = $(GCC_WARNINGS) \
|
|
|
35 |
-I$(top_srcdir) \
|
|
307
|
36 |
$(GNOMEUI_CFLAGS) \
|
|
|
37 |
$(GNOMEVFS_CFLAGS)
|
|
308
|
38 |
--- gnome-commander-1.2.4/plugins/fileroller/Makefile.am.orig 2007-06-12 10:47:15.349813052 +0100
|
|
|
39 |
+++ gnome-commander-1.2.4/plugins/fileroller/Makefile.am 2007-06-12 10:47:20.930556232 +0100
|
|
|
40 |
@@ -1,6 +1,6 @@
|
|
307
|
41 |
## Process this file with automake to produce Makefile.in
|
|
|
42 |
|
|
|
43 |
-AM_CPPFLAGS = -Wall \
|
|
308
|
44 |
+AM_CPPFLAGS = $(GCC_WARNINGS) \
|
|
|
45 |
-I$(top_srcdir) \
|
|
307
|
46 |
$(GNOMEUI_CFLAGS) \
|
|
|
47 |
$(GNOMEVFS_CFLAGS)
|
|
308
|
48 |
--- gnome-commander-1.2.4/plugins/test/Makefile.am.orig 2007-06-12 10:46:47.005255804 +0100
|
|
|
49 |
+++ gnome-commander-1.2.4/plugins/test/Makefile.am 2007-06-12 10:47:12.465542914 +0100
|
|
|
50 |
@@ -1,6 +1,6 @@
|
|
307
|
51 |
## Process this file with automake to produce Makefile.in
|
|
|
52 |
|
|
|
53 |
-AM_CPPFLAGS = -Wall \
|
|
308
|
54 |
+AM_CPPFLAGS = $(GCC_WARNINGS) \
|
|
|
55 |
-I$(top_srcdir) \
|
|
307
|
56 |
$(GNOMEUI_CFLAGS) \
|
|
308
|
57 |
$(GNOMEVFS_CFLAGS)
|
|
|
58 |
--- gnome-commander-1.2.4/src/Makefile.am.orig 2007-06-12 10:47:40.808431486 +0100
|
|
|
59 |
+++ gnome-commander-1.2.4/src/Makefile.am 2007-06-12 10:47:45.981793262 +0100
|
|
|
60 |
@@ -3,7 +3,7 @@
|
|
307
|
61 |
SUBDIRS = tags libgviewer
|
|
|
62 |
|
|
|
63 |
AM_CPPFLAGS = \
|
|
|
64 |
- -Wall \
|
|
308
|
65 |
+ $(GCC_WARNINGS) \
|
|
307
|
66 |
-I$(top_srcdir) \
|
|
|
67 |
$(GNOMEUI_CFLAGS) \
|
|
|
68 |
$(GNOMEVFS_CFLAGS) \
|
|
308
|
69 |
--- gnome-commander-1.2.4/src/libgviewer/Makefile.am.orig 2007-06-12 10:47:46.769065861 +0100
|
|
|
70 |
+++ gnome-commander-1.2.4/src/libgviewer/Makefile.am 2007-06-12 10:47:52.125803870 +0100
|
|
|
71 |
@@ -1,6 +1,6 @@
|
|
|
72 |
## Process this file with automake to produce Makefile.in
|
|
|
73 |
|
|
|
74 |
-AM_CPPFLAGS = -Wall \
|
|
|
75 |
+AM_CPPFLAGS = $(GCC_WARNINGS) \
|
|
|
76 |
-I$(top_srcdir) \
|
|
|
77 |
-I.. \
|
|
|
78 |
$(GLIB_CFLAGS) \
|
|
|
79 |
--- gnome-commander-1.2.4/src/tags/Makefile.am.orig 2007-06-12 10:47:27.895246409 +0100
|
|
|
80 |
+++ gnome-commander-1.2.4/src/tags/Makefile.am 2007-06-12 10:47:33.860231054 +0100
|
|
|
81 |
@@ -3,7 +3,7 @@
|
|
|
82 |
noinst_LIBRARIES = libgcmd-tags.a
|
|
|
83 |
|
|
|
84 |
AM_CPPFLAGS = \
|
|
|
85 |
- -Wall \
|
|
|
86 |
+ $(GCC_WARNINGS) \
|
|
|
87 |
-I$(top_srcdir) \
|
|
|
88 |
-I.. \
|
|
|
89 |
$(GNOMEUI_CFLAGS) \
|
|
|
90 |
--- gnome-commander-1.2.4/src/tags/id3lib/Makefile.am.orig 2007-06-12 10:47:35.048056852 +0100
|
|
|
91 |
+++ gnome-commander-1.2.4/src/tags/id3lib/Makefile.am 2007-06-12 10:47:40.228433542 +0100
|
|
|
92 |
@@ -1,7 +1,7 @@
|
|
307
|
93 |
noinst_LIBRARIES = libgcmd-id3lib.a
|
|
|
94 |
|
|
|
95 |
AM_CPPFLAGS = \
|
|
|
96 |
- -Wall \
|
|
308
|
97 |
+ $(GCC_WARNINGS) \
|
|
307
|
98 |
-I$(top_srcdir) \
|
|
|
99 |
$(GNOMEUI_CFLAGS)
|
|
|
100 |
|
|
308
|
101 |
--- gnome-commander-1.2.4/tests/gviewer/Makefile.am.orig 2007-06-12 10:47:52.897904911 +0100
|
|
|
102 |
+++ gnome-commander-1.2.4/tests/gviewer/Makefile.am 2007-06-12 10:47:59.254254337 +0100
|
|
|
103 |
@@ -1,5 +1,5 @@
|
|
|
104 |
## Process this file with automake to produce Makefile.in
|
|
|
105 |
-AM_CPPFLAGS = -Wall \
|
|
|
106 |
+AM_CPPFLAGS = $(GCC_WARNINGS) \
|
|
|
107 |
$(GLIB_CFLAGS) \
|
|
|
108 |
$(GTK_CFLAGS) \
|
|
|
109 |
$(GNOMEUI_CFLAGS) \
|
|
|
110 |
--- trunk/src/dict.h 2007/04/16 20:48:43 858
|
|
|
111 |
+++ trunk/src/dict.h 2007/06/11 22:08:01 972
|
|
|
112 |
@@ -54,8 +54,8 @@
|
|
|
113 |
template <typename KEY, typename VAL>
|
|
|
114 |
inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
|
|
|
115 |
{
|
|
|
116 |
- std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(VAL *) NULL));
|
|
|
117 |
- std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(KEY *) NULL));
|
|
|
118 |
+ std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
|
|
|
119 |
+ std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
|
|
307
|
120 |
|
|
308
|
121 |
if (k_pos.second)
|
|
|
122 |
k_pos.first->second = &v_pos.first->first;
|