Skip to content

Commit

Permalink
update r838
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed May 12, 2015
1 parent 4d30a32 commit 24bdfa8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/internal/iutest_regex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions include/iutest_matcher.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions include/iutest_ver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 24bdfa8

Please sign in to comment.