diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-12-07 17:40:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-07 17:40:38 +0100 |
| commit | 44b6ba9a4d969aa893edeb29555d79b3fc212ebc (patch) | |
| tree | 5640ead310f1b1df738b8f72acb6dcba8254a0ab /vespalib/src | |
| parent | 125d7f20f9994340e6a49fb22f4dfa905bd1fbb3 (diff) | |
| parent | 5ebc5712811b7af0ea6db09b5fb89ce2cf4d17f4 (diff) | |
Merge pull request #7898 from vespa-engine/balder/assert-first-time
Allow asserts that rember if they have been triggered before.
Diffstat (limited to 'vespalib/src')
4 files changed, 4 insertions, 5 deletions
diff --git a/vespalib/src/vespa/vespalib/component/version.cpp b/vespalib/src/vespa/vespalib/component/version.cpp index fc7ee703e7f..b0f14bc18f3 100644 --- a/vespalib/src/vespa/vespalib/component/version.cpp +++ b/vespalib/src/vespa/vespalib/component/version.cpp @@ -19,7 +19,7 @@ Version::Version(int major, int minor, int micro, const string & qualifier) Version::Version(const Version &) = default; Version & Version::operator = (const Version &) = default; -Version::~Version() { } +Version::~Version() = default; void Version::initialize() @@ -151,5 +151,4 @@ Version::compareTo(const Version& other) const return getQualifier().compare(other.getQualifier()); } - } // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/component/versionspecification.cpp b/vespalib/src/vespa/vespalib/component/versionspecification.cpp index 3351219804f..84cf446e8c5 100644 --- a/vespalib/src/vespa/vespalib/component/versionspecification.cpp +++ b/vespalib/src/vespa/vespalib/component/versionspecification.cpp @@ -22,7 +22,7 @@ VersionSpecification::VersionSpecification(int major, int minor, int micro, cons VersionSpecification::VersionSpecification(const VersionSpecification &) = default; -VersionSpecification::~VersionSpecification() { } +VersionSpecification::~VersionSpecification() = default; void VersionSpecification::initialize() diff --git a/vespalib/src/vespa/vespalib/component/versionspecification.h b/vespalib/src/vespa/vespalib/component/versionspecification.h index 5ba49106915..399db123a7a 100644 --- a/vespalib/src/vespa/vespalib/component/versionspecification.h +++ b/vespalib/src/vespa/vespalib/component/versionspecification.h @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vespalib/component/version.h> +#include "version.h" namespace vespalib { diff --git a/vespalib/src/vespa/vespalib/component/vtag.cpp b/vespalib/src/vespa/vespalib/component/vtag.cpp index b8ab2c5a920..c9cfade6e28 100644 --- a/vespalib/src/vespa/vespalib/component/vtag.cpp +++ b/vespalib/src/vespa/vespalib/component/vtag.cpp @@ -1,6 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <cstdio> #include "vtag.h" +#include <cstdio> #ifndef V_TAG #define V_TAG "NOTAG" |