summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Gustin <cedric.gustin@gmail.com>2006-02-27 21:39:33 +0000
committerCedric Gustin <gustin@src.gnome.org>2006-02-27 21:39:33 +0000
commit3216140da18a01187f0639f6aa843db1add76163 (patch)
tree41a1dfecfcd6f8639ccc45f3b4198c0d2aaaf6da
parent6b95610298ca4e8f532a98f487acccae86cea844 (diff)
downloadglibmm-3216140da18a01187f0639f6aa843db1add76163.tar.gz
Tag npos with GLIBMM_API, in order to dllexport it on win32. Bug #332438.
2006-02-27 Cedric Gustin <cedric.gustin@gmail.com> * glib/glibmm/ustring.h: Tag npos with GLIBMM_API, in order to dllexport it on win32. Bug #332438.
-rw-r--r--ChangeLog5
-rw-r--r--glib/glibmm/ustring.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 49a98167..4b16fc1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-27 Cedric Gustin <cedric.gustin@gmail.com>
+
+ * glib/glibmm/ustring.h: Tag npos with GLIBMM_API, in order to
+ dllexport it on win32. Bug #332438.
+
2006-02-07 Rob Page <page.rob@gmail.com>
* glib/glibmm/ustring.h: fix a typo in the documenation for uppercase()
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index 3c090796..ccbe0999 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -233,11 +233,11 @@ public:
#endif /* GLIBMM_HAVE_SUN_REVERSE_ITERATOR */
#ifdef GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
- static const size_type npos = std::string::npos;
+ static GLIBMM_API const size_type npos = std::string::npos;
#else
//The IRIX MipsPro compiler says "The indicated constant value is not known",
//so we need to initalize the static member data elsewhere.
- static const size_type npos;
+ static GLIBMM_API const size_type npos;
#endif
/*! Default constructor, which creates an empty string.