aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-02-25 16:18:34 +0100
committerGitHub <noreply@github.com>2019-02-25 16:18:34 +0100
commit50e5898f70d4ea1ece5065b06ea7f3a0755463b9 (patch)
tree9d5bb13f99ec6e4af52a65c10b5cfa8e08967cf1
parent25cc8147901647d5a2e6023fc207874ac1e4f217 (diff)
parent5e4df0a52bfcaf6426606ee7ca928e0f7f63aa30 (diff)
Merge pull request #8602 from vespa-engine/balder/unify-on-default-constructor
Unify on = default
-rw-r--r--config/src/vespa/config/common/vespa_version.cpp7
-rw-r--r--config/src/vespa/config/common/vespa_version.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/config/src/vespa/config/common/vespa_version.cpp b/config/src/vespa/config/common/vespa_version.cpp
index 9cc15388acd..7cbbe696dba 100644
--- a/config/src/vespa/config/common/vespa_version.cpp
+++ b/config/src/vespa/config/common/vespa_version.cpp
@@ -8,10 +8,9 @@ namespace config {
const VespaVersion currentVersion(VespaVersion::fromString(vespalib::string(vespalib::VersionTagComponent)));
-VespaVersion::VespaVersion(const VespaVersion & vespaVersion)
- : _versionString(vespaVersion._versionString)
-{
-}
+VespaVersion::VespaVersion(const VespaVersion & vespaVersion) = default;
+
+VespaVersion & VespaVersion::operator=(const VespaVersion &rhs) = default;
VespaVersion::VespaVersion(const vespalib::string & versionString)
: _versionString(versionString)
diff --git a/config/src/vespa/config/common/vespa_version.h b/config/src/vespa/config/common/vespa_version.h
index d953bec4347..0ee1970d447 100644
--- a/config/src/vespa/config/common/vespa_version.h
+++ b/config/src/vespa/config/common/vespa_version.h
@@ -14,7 +14,7 @@ public:
static VespaVersion fromString(const vespalib::string & versionString);
static const VespaVersion & getCurrentVersion();
VespaVersion(const VespaVersion & version);
- VespaVersion &operator=(const VespaVersion &rhs) = default;
+ VespaVersion &operator=(const VespaVersion &rhs);
const vespalib::string & toString() const;
private:
VespaVersion(const vespalib::string & versionString);