Fix some warnings when compiling with gcc

This commit is contained in:
Thomas Goyne 2014-01-01 10:28:10 -08:00
parent d21c33df31
commit 418e1cad98
3 changed files with 5 additions and 2 deletions

View File

@ -115,6 +115,8 @@ struct extended_range {
const int value; const int value;
}; };
#ifdef _MSC_VER
// Needed for msvc's debug assertions
bool operator<(extended_range const& lft, extended_range const& rgt) { bool operator<(extended_range const& lft, extended_range const& rgt) {
return lft.codepoint < rgt.codepoint; return lft.codepoint < rgt.codepoint;
} }
@ -122,6 +124,7 @@ bool operator<(extended_range const& lft, extended_range const& rgt) {
bool operator<(int lft, extended_range const& rgt) { bool operator<(int lft, extended_range const& rgt) {
return lft < rgt.codepoint; return lft < rgt.codepoint;
} }
#endif
bool operator<(extended_range const& lft, int rgt) { bool operator<(extended_range const& lft, int rgt) {
return lft.codepoint < rgt; return lft.codepoint < rgt;

View File

@ -92,7 +92,7 @@ namespace {
public: public:
TimecodeValidator(EbuTimecode *target) : value(target) { assert(target); } TimecodeValidator(EbuTimecode *target) : value(target) { assert(target); }
TimecodeValidator(TimecodeValidator const& other) : value(other.value) { } TimecodeValidator(TimecodeValidator const& other) : wxValidator(other), value(other.value) { }
}; };
} // namespace { } // namespace {

View File

@ -84,7 +84,7 @@ class EnumBinder : public wxValidator {
public: public:
explicit EnumBinder(T *value) : value(value) { } explicit EnumBinder(T *value) : value(value) { }
EnumBinder(EnumBinder const& rhs) : value(rhs.value) { } EnumBinder(EnumBinder const& rhs) : wxValidator(rhs), value(rhs.value) { }
}; };
template<typename T> template<typename T>