mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 12:12:47 +01:00
[NFC] Fixed some D79714 warnings
This commit is contained in:
parent
16f58ba2dc
commit
6ad099fd48
@ -1380,6 +1380,12 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
// To learn more about using these macros, please search for 'MATCHER'
|
// To learn more about using these macros, please search for 'MATCHER'
|
||||||
// on http://code.google.com/p/googlemock/wiki/CookBook.
|
// on http://code.google.com/p/googlemock/wiki/CookBook.
|
||||||
|
|
||||||
|
#define GTEST_DISALLOW_ASSIGN_MATCHER_(type)\
|
||||||
|
public:\
|
||||||
|
type(type const &) = default;\
|
||||||
|
private:\
|
||||||
|
void operator=(type const &) = delete;
|
||||||
|
|
||||||
#define MATCHER(name, description)\
|
#define MATCHER(name, description)\
|
||||||
class name##Matcher {\
|
class name##Matcher {\
|
||||||
public:\
|
public:\
|
||||||
@ -1416,7 +1422,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
name##Matcher() {\
|
name##Matcher() {\
|
||||||
}\
|
}\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##Matcher);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##Matcher);\
|
||||||
};\
|
};\
|
||||||
inline name##Matcher name() {\
|
inline name##Matcher name() {\
|
||||||
return name##Matcher();\
|
return name##Matcher();\
|
||||||
@ -1466,7 +1472,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
}\
|
}\
|
||||||
p0##_type p0;\
|
p0##_type p0;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type>\
|
template <typename p0##_type>\
|
||||||
inline name##MatcherP<p0##_type> name(p0##_type p0) {\
|
inline name##MatcherP<p0##_type> name(p0##_type p0) {\
|
||||||
@ -1521,7 +1527,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p0##_type p0;\
|
p0##_type p0;\
|
||||||
p1##_type p1;\
|
p1##_type p1;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP2);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP2);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type>\
|
template <typename p0##_type, typename p1##_type>\
|
||||||
inline name##MatcherP2<p0##_type, p1##_type> name(p0##_type p0, \
|
inline name##MatcherP2<p0##_type, p1##_type> name(p0##_type p0, \
|
||||||
@ -1581,7 +1587,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p1##_type p1;\
|
p1##_type p1;\
|
||||||
p2##_type p2;\
|
p2##_type p2;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP3);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP3);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type>\
|
template <typename p0##_type, typename p1##_type, typename p2##_type>\
|
||||||
inline name##MatcherP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
|
inline name##MatcherP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
|
||||||
@ -1646,7 +1652,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p2##_type p2;\
|
p2##_type p2;\
|
||||||
p3##_type p3;\
|
p3##_type p3;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP4);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP4);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type>\
|
typename p3##_type>\
|
||||||
@ -1719,7 +1725,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p3##_type p3;\
|
p3##_type p3;\
|
||||||
p4##_type p4;\
|
p4##_type p4;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP5);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP5);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type, typename p4##_type>\
|
typename p3##_type, typename p4##_type>\
|
||||||
@ -1794,7 +1800,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p4##_type p4;\
|
p4##_type p4;\
|
||||||
p5##_type p5;\
|
p5##_type p5;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP6);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP6);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type, typename p4##_type, typename p5##_type>\
|
typename p3##_type, typename p4##_type, typename p5##_type>\
|
||||||
@ -1875,7 +1881,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p5##_type p5;\
|
p5##_type p5;\
|
||||||
p6##_type p6;\
|
p6##_type p6;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP7);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP7);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type, typename p4##_type, typename p5##_type, \
|
typename p3##_type, typename p4##_type, typename p5##_type, \
|
||||||
@ -1962,7 +1968,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p6##_type p6;\
|
p6##_type p6;\
|
||||||
p7##_type p7;\
|
p7##_type p7;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP8);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP8);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type, typename p4##_type, typename p5##_type, \
|
typename p3##_type, typename p4##_type, typename p5##_type, \
|
||||||
@ -2054,7 +2060,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p7##_type p7;\
|
p7##_type p7;\
|
||||||
p8##_type p8;\
|
p8##_type p8;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP9);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP9);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type, typename p4##_type, typename p5##_type, \
|
typename p3##_type, typename p4##_type, typename p5##_type, \
|
||||||
@ -2151,7 +2157,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
|
|||||||
p8##_type p8;\
|
p8##_type p8;\
|
||||||
p9##_type p9;\
|
p9##_type p9;\
|
||||||
private:\
|
private:\
|
||||||
GTEST_DISALLOW_ASSIGN_(name##MatcherP10);\
|
GTEST_DISALLOW_ASSIGN_MATCHER_(name##MatcherP10);\
|
||||||
};\
|
};\
|
||||||
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
template <typename p0##_type, typename p1##_type, typename p2##_type, \
|
||||||
typename p3##_type, typename p4##_type, typename p5##_type, \
|
typename p3##_type, typename p4##_type, typename p5##_type, \
|
||||||
|
Loading…
Reference in New Issue
Block a user