aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authormitchell <unknown>2019-05-09 14:19:07 -0400
committermitchell <unknown>2019-05-09 14:19:07 -0400
commitc33fba07cbbf694cd33a1af3aae0d210bb0cd0df (patch)
treef86e6136761b16a07221229742041cef3963ab0f /src
parentd0fbe09c2ec7cac70b391be5427558287b8b9c80 (diff)
downloadscintilla-mirror-c33fba07cbbf694cd33a1af3aae0d210bb0cd0df.tar.gz
Fixed bad backport involving noexcept default constructors for Clang 3.4.
Diffstat (limited to 'src')
-rw-r--r--src/LineMarker.h2
-rw-r--r--src/UniqueString.cxx2
-rw-r--r--src/UniqueString.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/LineMarker.h b/src/LineMarker.h
index 8a15327d2..db3a8f15e 100644
--- a/src/LineMarker.h
+++ b/src/LineMarker.h
@@ -34,7 +34,7 @@ public:
* platforms must implement as empty. */
DrawLineMarkerFn customDraw = nullptr;
- LineMarker() noexcept = default;
+ LineMarker() = default;
LineMarker(const LineMarker &other);
LineMarker(LineMarker &&) noexcept = default;
LineMarker &operator=(const LineMarker& other);
diff --git a/src/UniqueString.cxx b/src/UniqueString.cxx
index aadc2ae7e..cacc0a7d8 100644
--- a/src/UniqueString.cxx
+++ b/src/UniqueString.cxx
@@ -28,7 +28,7 @@ UniqueString UniqueStringCopy(const char *text) {
// A set of strings that always returns the same pointer for each string.
-UniqueStringSet::UniqueStringSet() noexcept = default;
+UniqueStringSet::UniqueStringSet() = default;
UniqueStringSet::~UniqueStringSet() {
strings.clear();
diff --git a/src/UniqueString.h b/src/UniqueString.h
index f7f7ebbdc..442d17c79 100644
--- a/src/UniqueString.h
+++ b/src/UniqueString.h
@@ -29,7 +29,7 @@ class UniqueStringSet {
private:
std::vector<UniqueString> strings;
public:
- UniqueStringSet() noexcept;
+ UniqueStringSet();
// UniqueStringSet objects can not be copied.
UniqueStringSet(const UniqueStringSet &) = delete;
UniqueStringSet &operator=(const UniqueStringSet &) = delete;