Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-10-30 18:01:38 +0100
committerMartin Hořeňovský2019-10-30 18:01:38 +0100
commitca4c6218d418fe38571e67a1c60453bb2ab26fe7 (patch)
treedb1412a30f659882931d6dc7ae803d0717abb461
parentac4958395c651ff90a63a3a32c45d7cb46b41d86 (diff)
downloadcatch3-ca4c6218d418fe38571e67a1c60453bb2ab26fe7.tar.gz
Remove SourceLineInfo::empty()
-rw-r--r--docs/deprecations.md8
-rw-r--r--include/internal/catch_common.h5
2 files changed, 2 insertions, 11 deletions
diff --git a/docs/deprecations.md b/docs/deprecations.md
index 4101f739..c416ad6d 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -9,14 +9,6 @@ either of these is a breaking change, and thus will not happen until
at least the next major release.
-## Deprecations
-
-### SourceLineInfo::empty()
-
-There should be no reason to ever have an empty `SourceLineInfo`, so the
-method will be removed.
-
-
## Planned changes
### `CHECKED_IF` and `CHECKED_ELSE`
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h
index 5e097fbf..b4ca1c12 100644
--- a/include/internal/catch_common.h
+++ b/include/internal/catch_common.h
@@ -47,8 +47,8 @@ namespace Catch {
struct SourceLineInfo {
SourceLineInfo() = delete;
- SourceLineInfo( char const* _file, std::size_t _line ) noexcept
- : file( _file ),
+ constexpr SourceLineInfo( char const* _file, std::size_t _line ) noexcept:
+ file( _file ),
line( _line )
{}
@@ -57,7 +57,6 @@ namespace Catch {
SourceLineInfo( SourceLineInfo&& ) noexcept = default;
SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
- bool empty() const noexcept { return file[0] == '\0'; }
bool operator == ( SourceLineInfo const& other ) const noexcept;
bool operator < ( SourceLineInfo const& other ) const noexcept;