summaryrefslogtreecommitdiffstats
path: root/memfilepersistence
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-07-28 14:07:12 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-07-31 17:40:50 +0200
commit23a8a5e3e2d9e9ba9aae6f05b389ffbcbafdea09 (patch)
tree0b67ed4c092c9656acdf49f0416075f7d7647d71 /memfilepersistence
parentf50edc720a3fb1ffbd34229946b4b124a1f43caa (diff)
Fix compilation bug
Diffstat (limited to 'memfilepersistence')
-rw-r--r--memfilepersistence/src/vespa/memfilepersistence/common/options.cpp4
-rw-r--r--memfilepersistence/src/vespa/memfilepersistence/common/options.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp b/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp
index ddd64534393..34b2f23ed65 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp
@@ -32,8 +32,8 @@ Options::Options()
}
Options::Options(const Options &) noexcept = default;
-Options & Options::operator=(const Options &) noexcept = default;
-~Options() { }
+Options & Options::operator=(const Options &) = default;
+Options::~Options() { }
Options::Options(const vespa::config::storage::StorMemfilepersistenceConfig& newConfig,
const vespa::config::content::PersistenceConfig& newPersistenceConfig)
diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.h b/memfilepersistence/src/vespa/memfilepersistence/common/options.h
index 3dd01fbc18e..a7310c236a1 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/common/options.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.h
@@ -68,12 +68,9 @@ struct Options : public vespalib::Printable
* such that the current defaults can be easily viewed.
*/
Options();
-
Options(const Options &) noexcept;
- Options & operator=(const Options &) noexcept;
-
-
- ~Options() { }
+ Options & operator=(const Options &);
+ ~Options();
Options(const vespa::config::storage::StorMemfilepersistenceConfig& newConfig,
const vespa::config::content::PersistenceConfig& newPersistenceConfig);