diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2005-11-23 07:22:43 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2005-11-23 07:22:43 +0000 |
| commit | eaaf54104331a74a37bfa7d30926688d99ecc690 (patch) | |
| tree | b336653860d639109d3661179f74bbbaf4e3f67c | |
| parent | 8bd58fce612fe158a20da59b5e9c00345515287a (diff) | |
| download | glibmm-eaaf54104331a74a37bfa7d30926688d99ecc690.tar.gz | |
2.8.2:
2005-11-23 Murray Cumming <murrayc@murrayc.com>
* glib/glibmm/containers.h: Do not use g_assert() in
a header, because g++ sometimes warns that it has
no effect.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | glib/glibmm/containers.h | 2 |
4 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2.8.2: + +2005-11-23 Murray Cumming <murrayc@murrayc.com> + + * glib/glibmm/containers.h: Do not use g_assert() in + a header, because g++ sometimes warns that it has + no effect. + 2005-10-29 Murray Cumming <murrayc@murrayc.com> * scripts/macros.m4: AL_PROG_GNU_MAKE(): @@ -1,3 +1,8 @@ +2.8.2: + +* Solaris build fix: Correct the detection + of make. (Mark Rouchal) + 2.8.1: * Build: Check for glib 2.8. diff --git a/configure.in b/configure.in index c8e58055..5af87cb6 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ AC_PREREQ(2.50) ######################################################################### GLIBMM_MAJOR_VERSION=2 GLIBMM_MINOR_VERSION=8 -GLIBMM_MICRO_VERSION=1 +GLIBMM_MICRO_VERSION=2 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION AC_DEFINE_UNQUOTED(GLIBMM_MAJOR_VERSION, $GLIBMM_MAJOR_VERSION) @@ -38,7 +38,7 @@ AC_SUBST(GLIBMM_RELEASE) # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LIBGLIBMM_SO_VERSION=1:17:0 +LIBGLIBMM_SO_VERSION=1:18:0 AC_SUBST(LIBGLIBMM_SO_VERSION) AC_CONFIG_AUX_DIR(scripts) diff --git a/glib/glibmm/containers.h b/glib/glibmm/containers.h index c7090681..f152262e 100644 --- a/glib/glibmm/containers.h +++ b/glib/glibmm/containers.h @@ -178,7 +178,7 @@ public: reference operator*() const { - g_assert(node_); + //g++ complains that this statement has no effect: g_assert(node_); return reinterpret_cast<T&>( node_ ? node_->data : glibmm_null_pointer ); } |