Skip to content

Commit 742b093

Browse files
authored
Merge pull request #532 from beached/v2
Refactor to remove unnamed namespace in daw_check_exceptions.h
2 parents e2cfae6 + 20879f8 commit 742b093

12 files changed

+30
-32
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
cmake_minimum_required( VERSION 3.14 )
1010

1111
project( "daw-header-libraries"
12-
VERSION "2.114.0"
12+
VERSION "2.114.1"
1313
DESCRIPTION "Various headers"
1414
HOMEPAGE_URL "https://github.com/beached/header_libraries"
1515
LANGUAGES C CXX

include/daw/daw_check_exceptions.h

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,20 @@
3636
#endif
3737

3838
namespace daw::check_except_detail {
39-
namespace {
40-
template<typename Exception>
41-
[[noreturn, maybe_unused]] DAW_ATTRIB_NOINLINE void
42-
throw_error( Exception &&except ) {
39+
template<typename Exception>
40+
[[noreturn, maybe_unused]] DAW_ATTRIB_NOINLINE void
41+
throw_error( Exception &&except ) {
4342
#if defined( DAW_USE_EXCEPTIONS )
44-
throw DAW_FWD( except );
43+
throw DAW_FWD( except );
4544
#else
46-
(void)except;
45+
(void)except;
4746
#endif
48-
}
47+
}
4948

50-
template<typename>
51-
[[noreturn, maybe_unused]] DAW_ATTRIB_NOINLINE inline void terminate_error( ) {
52-
std::terminate( );
53-
}
54-
} // namespace
49+
[[noreturn, maybe_unused]] DAW_ATTRIB_NOINLINE inline void
50+
terminate_error( ) {
51+
std::terminate( );
52+
}
5553
} // namespace daw::check_except_detail
5654

5755
#if defined( DAW_USE_EXCEPTIONS )

include/daw/daw_hash_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "ciso646.h"
1212
#include "daw_algorithm.h"
13-
#include "daw_check_exceptions.h"
13+
#include "daw/daw_check_exceptions.h"
1414

1515
#include <functional>
1616
#include <optional>

include/daw/daw_static_bitset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "ciso646.h"
1212
#include "daw_bit.h"
1313
#include "daw_bounded_array.h"
14-
#include "daw_check_exceptions.h"
14+
#include "daw/daw_check_exceptions.h"
1515
#include "daw_string_view.h"
1616
#include "daw_traits.h"
1717
#include "daw_utility.h"

include/daw/daw_string_view.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "algorithms/daw_algorithm_find.h"
1515
#include "ciso646.h"
1616
#include "daw_assume.h"
17-
#include "daw_check_exceptions.h"
17+
#include "daw/daw_check_exceptions.h"
1818
#include "daw_compiler_fixups.h"
1919
#include "daw_consteval.h"
2020
#include "daw_cpp_feature_check.h"

include/daw/daw_unique_array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "ciso646.h"
1212
#include "cpp_17.h"
13-
#include "daw_check_exceptions.h"
13+
#include "daw/daw_check_exceptions.h"
1414
#include "daw_exception.h"
1515
#include "daw_exchange.h"
1616
#include "daw_swap.h"

include/daw/daw_validated.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma once
1010

1111
#include "ciso646.h"
12-
#include "daw_check_exceptions.h"
12+
#include "daw/daw_check_exceptions.h"
1313
#include "daw_construct_a.h"
1414
#include "daw_move.h"
1515
#include "daw_remove_cvref.h"

include/daw/daw_variant_cast.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "ciso646.h"
1212
#include "cpp_17.h"
13-
#include "daw_check_exceptions.h"
13+
#include "daw/daw_check_exceptions.h"
1414
#include "daw_move.h"
1515
#include "daw_remove_cvref.h"
1616
#include "daw_traits.h"

include/daw/daw_visit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "cpp_17.h"
1313
#include "daw_assume.h"
1414
#include "daw_attributes.h"
15-
#include "daw_check_exceptions.h"
15+
#include "daw/daw_check_exceptions.h"
1616
#include "daw_consteval.h"
1717
#include "daw_likely.h"
1818
#include "daw_move.h"

include/daw/split_buffer.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
#pragma once
88

9-
#include "compressed_pair.h"
10-
#include "daw_check_exceptions.h"
11-
#include "daw_concepts.h"
12-
#include "daw_exception.h"
13-
#include "daw_exchange.h"
14-
#include "daw_move.h"
9+
#include "daw/compressed_pair.h"
10+
#include "daw/daw_check_exceptions.h"
11+
#include "daw/daw_concepts.h"
12+
#include "daw/daw_exception.h"
13+
#include "daw/daw_exchange.h"
14+
#include "daw/daw_move.h"
1515

1616
#include <algorithm>
1717
#include <type_traits>

0 commit comments

Comments
 (0)