• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1319 (tree)
Time2018-05-31 23:44:30
Authorsrz_zumix

Log Message

Merge pull request #58 from yumetodo/fix/avoid_deprecated_special_function_call

fix: avoid deprecated special function call
git@d4e68d9a8b7038ecc77d78189440b06878580f66
https://github.com/srz-zumix/iutest/commit/d4e68d9a8b7038ecc77d78189440b06878580f66


Create Dockerfile.arm
git@69bdc23a4da4b8752e04d944b3fb308c7523653b

Change Summary

Incremental Difference

--- trunk/include/iutest_matcher.hpp (revision 1318)
+++ trunk/include/iutest_matcher.hpp (revision 1319)
@@ -65,6 +65,8 @@
6565 template<typename T>
6666 struct is_matcher : public iutest_type_traits::is_base_of<IMatcher, T> {};
6767 public:
68+ // IMatcher(const IMatcher &) {}
69+ IMatcher& operator = (const IMatcher&) { return *this; }
6870 virtual ~IMatcher() {}
6971 virtual ::std::string WhichIs() const = 0;
7072 };
@@ -82,6 +84,7 @@
8284 #define DECL_COMPARE_MATCHER(name, op) \
8385 template<typename T>class IUTEST_PP_CAT(name, Matcher): public IMatcher{ \
8486 public: explicit IUTEST_PP_CAT(name, Matcher)(const T& v) : m_expected(v) {}\
87+ IUTEST_PP_CAT(name, Matcher)(const IUTEST_PP_CAT(name, Matcher) & rhs) : m_expected(rhs.m_expected) {}\
8588 ::std::string WhichIs() const IUTEST_CXX_OVERRIDE { \
8689 iu_global_format_stringstream strm; \
8790 strm << #name ": " << m_expected; return strm.str(); \
@@ -97,6 +100,7 @@
97100 #define DECL_COMPARE_MATCHER2(name, op) \
98101 class IUTEST_PP_CAT(Twofold, IUTEST_PP_CAT(name, Matcher)): public IMatcher{ \
99102 public: IUTEST_PP_CAT(Twofold, IUTEST_PP_CAT(name, Matcher))() {} \
103+ IUTEST_PP_CAT(Twofold, IUTEST_PP_CAT(name, Matcher))(const IUTEST_PP_CAT(Twofold, IUTEST_PP_CAT(name, Matcher)) &) {}\
100104 ::std::string WhichIs() const IUTEST_CXX_OVERRIDE { return #name; } \
101105 template<typename T, typename U>AssertionResult operator () \
102106 (const T& actual, const U& expected) const { \
@@ -332,7 +336,7 @@
332336 {
333337 public:
334338 explicit HasSubstrMatcher(T expected) : m_expected(expected) {}
335-
339+ HasSubstrMatcher(const HasSubstrMatcher & rhs) : m_expected(rhs.m_expected) {}
336340 public:
337341 template<typename U>
338342 AssertionResult operator ()(const U& actual) const
@@ -1453,6 +1457,7 @@
14531457 {
14541458 public:
14551459 AnyMatcher() {}
1460+ AnyMatcher(const AnyMatcher &) {}
14561461 public:
14571462 AssertionResult operator ()(const T&) const
14581463 {
@@ -1479,6 +1484,7 @@
14791484 {
14801485 public:
14811486 AnythingMatcher() {}
1487+ AnythingMatcher(const AnythingMatcher &) {}
14821488 public:
14831489 template<typename U>
14841490 AssertionResult operator ()(const U&) const
--- trunk/include/internal/iutest_list.hpp (revision 1318)
+++ trunk/include/internal/iutest_list.hpp (revision 1319)
@@ -67,6 +67,11 @@
6767 public:
6868 iu_list_iterator(value_ptr p=NULL) IUTEST_CXX_NOEXCEPT_SPEC : m_node(p) {} // NOLINT
6969 iu_list_iterator(const iu_list_iterator& rhs) IUTEST_CXX_NOEXCEPT_SPEC : m_node(rhs.m_node) {}
70+ iu_list_iterator& operator = (const iu_list_iterator& rhs) IUTEST_CXX_NOEXCEPT_SPEC
71+ {
72+ m_node = rhs.m_node;
73+ return *this;
74+ }
7075
7176 public:
7277 bool operator == (const _Myt& it) const { return this->m_node == it.m_node; }
--- trunk/include/internal/iutest_regex.hpp (revision 1318)
+++ trunk/include/internal/iutest_regex.hpp (revision 1319)
@@ -46,6 +46,7 @@
4646 public:
4747 iuRegex(const char* pattern) { Init(pattern); } // NOLINT
4848 iuRegex(const ::std::string& pattern) { Init(pattern.c_str()); } // NOLINT
49+ iuRegex(const iuRegex & rhs) : m_re(rhs.m_re), m_pattern(rhs.m_pattern) {}
4950 public:
5051 bool FullMatch(const char* str) const;
5152 bool PartialMatch(const char* str) const;
Show on old repository browser