glibmm r780 - in trunk: . glib/src

[murrayc svn gnome org]

Author: murrayc
Date: Thu Feb  5 15:54:53 2009
New Revision: 780
URL: http://svn.gnome.org/viewvc/glibmm?rev=780&view=rev

Log:
2009-02-05  Murray Cumming  <murrayc murrayc com>

* glib/src/regex.hg: create(): For the version when 
GLIBMM_EXCEPTIONS_ENABLED is not defined, do not specify default 
parameter values because we have an extra error parameter.
Bug #570648 (Bernd Buschinski)

Modified:
   trunk/ChangeLog
   trunk/glib/src/regex.hg

Modified: trunk/glib/src/regex.hg
==============================================================================
--- trunk/glib/src/regex.hg	(original)
+++ trunk/glib/src/regex.hg	Thu Feb  5 15:54:53 2009
@@ -99,7 +99,7 @@
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   static Glib::RefPtr<Glib::Regex> create(const Glib::ustring& pattern, RegexCompileFlags compile_options = static_cast<RegexCompileFlags>(0), RegexMatchFlags match_options = static_cast<RegexMatchFlags>(0));
 #else
-  static Glib::RefPtr<Glib::Regex> create(const Glib::ustring& pattern, RegexCompileFlags compile_options = static_cast<RegexCompileFlags>(0), RegexMatchFlags match_options = static_cast<RegexMatchFlags>(0), std::auto_ptr<Glib::Error>& error);
+  static Glib::RefPtr<Glib::Regex> create(const Glib::ustring& pattern, RegexCompileFlags compile_options, RegexMatchFlags match_options, std::auto_ptr<Glib::Error>& error);
 #endif /* !GLIBMM_EXCEPTIONS_ENABLED */
   
   _WRAP_METHOD(Glib::ustring get_pattern() const, g_regex_get_pattern)