diff options
author | George Hazan <ghazan@miranda.im> | 2017-09-28 21:25:05 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2017-09-28 21:25:05 +0300 |
commit | 06b43e58cb6fa1fdaab6a586dd762d94c9737ea0 (patch) | |
tree | 10ae7b29f5320c3d69aa214baf189784c028741f /plugins/Boltun/src | |
parent | e4fa578df9545982adf781b9c080f5ab4e71855c (diff) |
more fixes for VS2017 compilation
Diffstat (limited to 'plugins/Boltun/src')
-rw-r--r-- | plugins/Boltun/src/Engine/MyCodeCvt.cpp | 10 | ||||
-rw-r--r-- | plugins/Boltun/src/Engine/MyCodeCvt.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.cpp b/plugins/Boltun/src/Engine/MyCodeCvt.cpp index e6a491947a..92e5046831 100644 --- a/plugins/Boltun/src/Engine/MyCodeCvt.cpp +++ b/plugins/Boltun/src/Engine/MyCodeCvt.cpp @@ -55,27 +55,27 @@ MyCodeCvt::result MyCodeCvt::do_unshift(_St&, #ifdef MSVC
int MyCodeCvt::do_length(_St& _State, const _To* _F1,
- const _To* _L1, size_t _N2) const _THROW0()
+ const _To* _L1, size_t _N2) const throw()
#else
int MyCodeCvt::do_length(const _St&, const _To* _F1,
- const _To* _L1, size_t _N2) const _THROW0()
+ const _To* _L1, size_t _N2) const throw()
#endif
{
return (_N2 < (size_t)(_L1 - _F1)) ? (int)_N2 : (int)(_L1 - _F1);
}
-bool MyCodeCvt::do_always_noconv() const _THROW0()
+bool MyCodeCvt::do_always_noconv() const throw()
{
return true;
}
-int MyCodeCvt::do_max_length() const _THROW0()
+int MyCodeCvt::do_max_length() const throw()
{
return 2;
}
-int MyCodeCvt::do_encoding() const _THROW0()
+int MyCodeCvt::do_encoding() const throw()
{
return 2;
}
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.h b/plugins/Boltun/src/Engine/MyCodeCvt.h index df78cbad1b..e397a6a304 100644 --- a/plugins/Boltun/src/Engine/MyCodeCvt.h +++ b/plugins/Boltun/src/Engine/MyCodeCvt.h @@ -43,13 +43,13 @@ protected: #endif
virtual result do_unshift(_St& _State, _To* _F2, _To* _L2, _To*& _Mid2) const;
#ifdef MSVC
- virtual int do_length(_St& _State, const _To* _F1, const _To* _L1, size_t _N2) const _THROW0();
+ virtual int do_length(_St& _State, const _To* _F1, const _To* _L1, size_t _N2) const noexcept;
#else
- virtual int do_length(const _St& _State, const _To* _F1, const _To* _L1, size_t _N2) const _THROW0();
+ virtual int do_length(const _St& _State, const _To* _F1, const _To* _L1, size_t _N2) const throw();
#endif
- virtual bool do_always_noconv() const _THROW0();
- virtual int do_max_length() const _THROW0();
- virtual int do_encoding() const _THROW0();
+ virtual bool do_always_noconv() const throw();
+ virtual int do_max_length() const throw();
+ virtual int do_encoding() const throw();
};
#endif /* MYCODECVT_H */
\ No newline at end of file |