diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2015-09-01 09:05:55 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2015-09-01 12:04:11 +0200 |
| commit | a1f0b1a06095d81b6a5b8255b818b1c35c92df29 (patch) | |
| tree | e669201cc4a0f6712ffcbbdf473163964c3b87ff /glib | |
| parent | 6f37cc887e31570aa9c0c3cbfcef2e564388490c (diff) | |
| download | glibmm-a1f0b1a06095d81b6a5b8255b818b1c35c92df29.tar.gz | |
Deprecate Regex now that we have std::regex.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/glibmm.h | 1 | ||||
| -rw-r--r-- | glib/src/filelist.am | 2 | ||||
| -rw-r--r-- | glib/src/regex.hg | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/glib/glibmm.h b/glib/glibmm.h index fb409f81..3f076d29 100644 --- a/glib/glibmm.h +++ b/glib/glibmm.h @@ -36,7 +36,6 @@ * - Glib::ustring: A UTF-8 string class that can be used interchangably with std::string. Plus @ref StringUtils * - Glib::RefPtr: A reference-counting smartpointer, for use with Glib::ObjectBase or similar * - @ref CharsetConv - * - Glib::Regex: Regular expression string matching. * - Glib::KeyFile: Parsing and writing of key files (similar to .ini files) * - Glib::Checksum * - Glib::Date, Glib::Timer, Glib::TimeVal diff --git a/glib/src/filelist.am b/glib/src/filelist.am index 94341328..8851af57 100644 --- a/glib/src/filelist.am +++ b/glib/src/filelist.am @@ -32,7 +32,6 @@ glibmm_files_any_hg = \ optioncontext.hg \ optionentry.hg \ optiongroup.hg \ - regex.hg \ shell.hg \ spawn.hg \ threads.hg \ @@ -45,6 +44,7 @@ glibmm_files_any_hg = \ varianttype.hg glibmm_files_deprecated_hg = \ + regex.hg \ thread.hg \ valuearray.hg diff --git a/glib/src/regex.hg b/glib/src/regex.hg index 0044b12f..66bfe34b 100644 --- a/glib/src/regex.hg +++ b/glib/src/regex.hg @@ -17,6 +17,8 @@ _DEFS(glibmm,glib) +_IS_DEPRECATED // This whole file is deprecated. + #include <glibmmconfig.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> @@ -35,6 +37,7 @@ _WRAP_ENUM(RegexCompileFlags, GRegexCompileFlags, NO_GTYPE) _WRAP_ENUM(RegexMatchFlags, GRegexMatchFlags, NO_GTYPE) /** Exception class for Regex + * @deprecated Glib::Regex is deprecated in favor of std::regex. */ _WRAP_GERROR(RegexError, GRegexError, G_REGEX_ERROR, NO_GTYPE) @@ -91,6 +94,8 @@ class MatchInfo; * The regular expressions low level functionalities are obtained through the * excellent PCRE library written by Philip Hazel. * + * @deprecated Glib::Regex is deprecated in favor of std::regex. + * * @newin{2,14} */ class Regex final @@ -210,6 +215,8 @@ public: /** MatchInfo - MatchInfo is used to retrieve information about the regular * expression match which created it. * @newin{2,28} + * + * @deprecated Glib::Regex is deprecated in favor of std::regex. */ class MatchInfo { |