From 24bdfa8ee5efa69200e4f46c774152a0647e27c9 Mon Sep 17 00:00:00 2001 From: srz-zumix Date: Tue, 12 May 2015 12:38:45 +0900 Subject: [PATCH] update r838 --- doc/Doxyfile | 2 +- include/internal/iutest_regex.hpp | 2 +- include/iutest_matcher.hpp | 4 ++-- include/iutest_ver.hpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index ed0ec07e9d..b59a1f7686 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = iutest # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.11.99.6 +PROJECT_NUMBER = 1.11.99.7 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/include/internal/iutest_regex.hpp b/include/internal/iutest_regex.hpp index 8c498b04ba..e77357eafd 100644 --- a/include/internal/iutest_regex.hpp +++ b/include/internal/iutest_regex.hpp @@ -51,7 +51,7 @@ class iuRegex bool FullMatch(const char* str) const; bool PartialMatch(const char* str) const; - const char* pattern() const { m_pattern.c_str(); } + const char* pattern() const { return m_pattern.c_str(); } private: void Init(const char* pattern); diff --git a/include/iutest_matcher.hpp b/include/iutest_matcher.hpp index a67cc6145f..ab625883fe 100644 --- a/include/iutest_matcher.hpp +++ b/include/iutest_matcher.hpp @@ -1560,12 +1560,12 @@ class RegexMatcher : public IMatcher return strm.str(); } private: - bool Regex(const char* actual) + bool Regex(const char* actual) const { return m_full_match ? m_expected.FullMatch(actual) : m_expected.PartialMatch(actual); } - bool Regex(const ::std::string& actual) + bool Regex(const ::std::string& actual) const { return m_full_match ? m_expected.FullMatch(actual.c_str()) : m_expected.PartialMatch(actual.c_str()); diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp index 0afe289f48..a221f107cb 100644 --- a/include/iutest_ver.hpp +++ b/include/iutest_ver.hpp @@ -17,11 +17,11 @@ //====================================================================== // define -#define IUTEST_VER 0x01119906u //!< iutest version 1.11.99.6 +#define IUTEST_VER 0x01119907u //!< iutest version 1.11.99.7 #define IUTEST_MAJORVER 0x01u //!< Major Version #define IUTEST_MINORVER 0x11u //!< Minor Version #define IUTEST_BUILD 0x99u //!< Build -#define IUTEST_REVISION 0x06u //!< Revision +#define IUTEST_REVISION 0x07u //!< Revision /** * @mainpage