--- code/trunk/pcrecpp.h 2007/09/19 08:57:53 256 +++ code/trunk/pcrecpp.h 2008/01/21 14:57:19 308 @@ -346,9 +346,6 @@ #define PCRE_IS_SET(o) \ (all_options_ & o) == o -// We convert user-passed pointers into special Arg objects -PCRECPP_EXP_DECL Arg no_arg; - /***** Compiling regular expressions: the RE class *****/ // RE_Options allow you to set options to be passed along to pcre, @@ -403,25 +400,25 @@ return PCRE_IS_SET(PCRE_DOTALL); } RE_Options &set_dotall(bool x) { - PCRE_SET_OR_CLEAR(x,PCRE_DOTALL); + PCRE_SET_OR_CLEAR(x, PCRE_DOTALL); } bool extended() const { return PCRE_IS_SET(PCRE_EXTENDED); } RE_Options &set_extended(bool x) { - PCRE_SET_OR_CLEAR(x,PCRE_EXTENDED); + PCRE_SET_OR_CLEAR(x, PCRE_EXTENDED); } bool dollar_endonly() const { return PCRE_IS_SET(PCRE_DOLLAR_ENDONLY); } RE_Options &set_dollar_endonly(bool x) { - PCRE_SET_OR_CLEAR(x,PCRE_DOLLAR_ENDONLY); + PCRE_SET_OR_CLEAR(x, PCRE_DOLLAR_ENDONLY); } bool extra() const { - return PCRE_IS_SET( PCRE_EXTRA); + return PCRE_IS_SET(PCRE_EXTRA); } RE_Options &set_extra(bool x) { PCRE_SET_OR_CLEAR(x, PCRE_EXTRA); @@ -646,6 +643,9 @@ // regexp wasn't valid on construction. int NumberOfCapturingGroups() const; + // The default value for an argument, to indicate no arg was passed in + static Arg no_arg; + private: void Init(const string& pattern, const RE_Options* options);