testfile.cpp (kdbg-2.5.5) | : | testfile.cpp (kdbg-2.5.6) | ||
---|---|---|---|---|
skipping to change at line 41 | skipping to change at line 41 | |||
}; | }; | |||
typedef void (*PtrFunc)(E*, char); | typedef void (*PtrFunc)(E*, char); | |||
class Dl : public Cl | class Dl : public Cl | |||
{ | { | |||
public: | public: | |||
Dl(int r); | Dl(int r); | |||
virtual int f(int x); | virtual int f(int x); | |||
int operator()(const QString& x, int& y) const; | int operator()(const QString& x, int& y) const; | |||
operator const char*() { return 0; } | virtual operator const char*() const { return 0; } | |||
operator PtrFunc*(); | operator PtrFunc*(); | |||
void takeACStr(const char* cstr); | void takeACStr(const char* cstr); | |||
double m; | ||||
}; | }; | |||
namespace A { | namespace A { | |||
namespace { | namespace { | |||
namespace B { | namespace B { | |||
namespace { | namespace { | |||
namespace { | namespace { | |||
enum Depth { flat, shallow, deep }; | enum Depth { flat, shallow, deep }; | |||
void g() | void g() | |||
{ | { | |||
skipping to change at line 188 | skipping to change at line 189 | |||
s += "rst"; | s += "rst"; | |||
strtest(s); | strtest(s); | |||
s = ""; | s = ""; | |||
Cl c1(13); | Cl c1(13); | |||
Dl d1(3214); | Dl d1(3214); | |||
d1.f(17); | d1.f(17); | |||
int n = 83; | int n = 83; | |||
d1(strref, n); | d1(strref, n); | |||
PtrFunc* ppf = d1; | PtrFunc* ppf = d1; | |||
const char* (Dl::*pmf)() const = &Dl::operator const char*; | ||||
double (Dl::*pmv) = &Dl::m; | ||||
d1.takeACStr(globarstr); | d1.takeACStr(globarstr); | |||
} | } | |||
Cl::Cl(int r) : | Cl::Cl(int r) : | |||
k(r), | k(r), | |||
l(sin(r)) | l(sin(r)) | |||
{ | { | |||
std::cout << l << std::endl; | std::cout << l << std::endl; | |||
} | } | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added |