Backport: Remove workaround for problems with noexcept.

Backport of changeset 6681:84298b2b66f2.

1 files changed, 2 insertions, 10 deletions

diff --git a/src/Document.cxx b/src/Document.cxx
index 04a83d7ff..1d77f7065 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"
@@ -2617,7 +2609,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;
 	}
@@ -2804,7 +2796,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;
 	}