diff options
author | mitchell <unknown> | 2018-06-03 09:43:02 -0400 |
---|---|---|
committer | mitchell <unknown> | 2018-06-03 09:43:02 -0400 |
commit | beaf4e3e3fdadfe710c143299a611ada30b7b547 (patch) | |
tree | 10539ec6e2fddf0fe9475bf206b271c1a75a0ced /src | |
parent | d7cbae3918c5579e15b449c51ad9a00b35a50321 (diff) | |
download | scintilla-mirror-beaf4e3e3fdadfe710c143299a611ada30b7b547.tar.gz |
Fixed compilation failures with MSVC 2015.
Thanks to Neil.
Diffstat (limited to 'src')
-rw-r--r-- | src/PositionCache.h | 4 | ||||
-rw-r--r-- | src/Style.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/PositionCache.h b/src/PositionCache.h index bc70b7f4e..8aaead094 100644 --- a/src/PositionCache.h +++ b/src/PositionCache.h @@ -145,8 +145,8 @@ public: PositionCacheEntry(); // Copy constructor not currently used, but needed for being element in std::vector. PositionCacheEntry(const PositionCacheEntry &); - // Deleted so PositionCacheEntry objects can not be assigned. - PositionCacheEntry(PositionCacheEntry &&) = delete; + // PositionCacheEntry objects should not be moved but MSVC 2015 requires this. + PositionCacheEntry(PositionCacheEntry &&) = default; void operator=(const PositionCacheEntry &) = delete; void operator=(PositionCacheEntry &&) = delete; ~PositionCacheEntry(); diff --git a/src/Style.h b/src/Style.h index 81b399806..7a497b36b 100644 --- a/src/Style.h +++ b/src/Style.h @@ -72,7 +72,7 @@ public: Style(); Style(const Style &source); - Style(Style &&) = delete; + Style(Style &&) = default; ~Style(); Style &operator=(const Style &source); Style &operator=(Style &&) = delete; |