[glibmm] Variant: Fix compiler warnings.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Variant: Fix compiler warnings.
- Date: Wed, 22 Dec 2010 08:24:51 +0000 (UTC)
commit 58738c58ca6f190f33ef6d0953c02746b5f59381
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Dec 22 09:24:45 2010 +0100
Variant: Fix compiler warnings.
* glib/src/variant.ccg: Remove some uses of the typename keyword to avoid
warnings about using them outside of templates (they were in template
specializations, which I guess is different).
ChangeLog | 8 ++++++++
NEWS | 13 +++++++++++++
configure.ac | 4 ++--
glib/src/variant.ccg | 4 ++--
4 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b5dc819..7738ea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-22 Murray Cumming <murrayc murrayc com>
+
+ Variant: Fix compiler warnings.
+
+ * glib/src/variant.ccg: Remove some uses of the typename keyword to avoid
+ warnings about using them outside of templates (they were in template
+ specializations, which I guess is different).
+
2010-12-22 José Alburquerque <jaalburqu svn gnome org>
Variant< std::vector<std::string> >: Correct the getting of the array.
diff --git a/NEWS b/NEWS
index bbbae50..7f90be2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+2.27.5: (unstable):
+
+Glib:
+* Added Variant<std::string>, Glib::Variant< array >, and
+ Variant< vector > specializations
+
+Gio:
+* Added DBus client example: examples/dbus/well-known-address-client.cc
+ (José Alburquerque)
+* Fox the build with mingw32.
+ (José Alburquerque) Bug #636754 (t.sailer)
+
+
2.27.4.1: (unstable):
Gio:
diff --git a/configure.ac b/configure.ac
index 0cdb57c..8e3f966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([glibmm], [2.27.4.1],
+AC_INIT([glibmm], [2.27.5],
[http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
[glibmm], [http://www.gtkmm.org/])
AC_PREREQ([2.59])
@@ -57,7 +57,7 @@ AS_IF([test "x$enable_static" = xyes],
AC_DEFINE([GIOMM_STATIC_LIB], [1], [Define if giomm is built as a static library])
])
-glibreq='2.0 >= 2.27.4'
+glibreq='2.0 >= 2.27.5'
GLIBMM_MODULES="sigc++-2.0 >= 2.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg
index 7a3d2ac..e9f061c 100644
--- a/glib/src/variant.ccg
+++ b/glib/src/variant.ccg
@@ -176,7 +176,7 @@ Variant<type_vec_ustring>::create(const type_vec_ustring& data)
GVariantBuilder* builder = g_variant_builder_new(array_variant_type.gobj());
// Add the elements of the vector into the builder.
- for(typename type_vec_ustring::const_iterator iter = data.begin();
+ for(type_vec_ustring::const_iterator iter = data.begin();
iter < data.end(); iter++)
{
g_variant_builder_add(builder,
@@ -259,7 +259,7 @@ Variant<type_vec_string>::create(const type_vec_string& data)
GVariantBuilder* builder = g_variant_builder_new(array_variant_type.gobj());
// Add the elements of the vector into the builder.
- for(typename type_vec_string::const_iterator iter = data.begin();
+ for(type_vec_string::const_iterator iter = data.begin();
iter < data.end(); iter++)
{
g_variant_builder_add(builder,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]