diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-04-11 16:10:32 +1000 | 
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-04-11 16:10:32 +1000 | 
| commit | 37ae7ea7fcfca313265d85bb4bc9e56b0f29fd82 (patch) | |
| tree | 77b149afcc3d133d055f8880b7c150c5a09db939 | |
| parent | 0ee2ba3229dcd19ccb05194668c8620f5cf7b6d5 (diff) | |
| download | scintilla-mirror-37ae7ea7fcfca313265d85bb4bc9e56b0f29fd82.tar.gz | |
Remove workaround for problems with noexcept.
| -rw-r--r-- | src/Document.cxx | 12 | 
1 files changed, 2 insertions, 10 deletions
| diff --git a/src/Document.cxx b/src/Document.cxx index 70f52c054..3b70432e3 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -19,16 +19,8 @@  #include <algorithm>  #include <memory> -#define NOEXCEPT -  #ifndef NO_CXX11_REGEX  #include <regex> -#if defined(__GLIBCXX__) -// If using the GNU implementation of <regex> then have 'noexcept' so can use -// when defining regex iterators to keep Clang analyze happy. -#undef NOEXCEPT -#define NOEXCEPT noexcept -#endif  #endif  #include "Platform.h" @@ -2613,7 +2605,7 @@ public:  	Sci::Position position;  	ByteIterator(const Document *doc_ = 0, Sci::Position position_ = 0) : doc(doc_), position(position_) {  	} -	ByteIterator(const ByteIterator &other) NOEXCEPT { +	ByteIterator(const ByteIterator &other) noexcept {  		doc = other.doc;  		position = other.position;  	} @@ -2800,7 +2792,7 @@ public:  	UTF8Iterator(const Document *doc_=0, Sci::Position position_=0) : doc(doc_), position(position_) {  	} -	UTF8Iterator(const UTF8Iterator &other) NOEXCEPT { +	UTF8Iterator(const UTF8Iterator &other) noexcept {  		doc = other.doc;  		position = other.position;  	} | 
