Skip to content

Commit d487e32

Browse files
authored
Merge pull request #12 from 7bitcoder/dev
Remove nodiscard from utils
2 parents 0baff2b + 24d16ee commit d487e32

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

Include/SevenBit/Conf/Details/Utils.hpp

+19-21
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,35 @@
1515

1616
namespace sb::cf::details::utils
1717
{
18-
EXPORT [[nodiscard]] bool isNumberString(std::string_view str);
18+
EXPORT bool isNumberString(std::string_view str);
1919

20-
EXPORT [[nodiscard]] bool ignoreCaseLess(std::string_view str, std::string_view search);
20+
EXPORT bool ignoreCaseLess(std::string_view str, std::string_view search);
2121

22-
EXPORT [[nodiscard]] bool ignoreCaseEqual(std::string_view str, std::string_view search);
22+
EXPORT bool ignoreCaseEqual(std::string_view str, std::string_view search);
2323

24-
EXPORT [[nodiscard]] bool containsAt(std::string_view str, size_t index, std::string_view search);
24+
EXPORT bool containsAt(std::string_view str, size_t index, std::string_view search);
2525

26-
EXPORT [[nodiscard]] std::optional<std::string_view> containsAt(std::string_view str, size_t index,
27-
const std::vector<std::string_view> &searches);
26+
EXPORT std::optional<std::string_view> containsAt(std::string_view str, size_t index,
27+
const std::vector<std::string_view> &searches);
2828

29-
EXPORT [[nodiscard]] bool containsAtFromEnd(std::string_view str, size_t index, std::string_view search);
29+
EXPORT bool containsAtFromEnd(std::string_view str, size_t index, std::string_view search);
3030

31-
EXPORT [[nodiscard]] std::optional<std::string_view> containsAtFromEnd(
32-
std::string_view str, size_t index, const std::vector<std::string_view> &searches);
31+
EXPORT std::optional<std::string_view> containsAtFromEnd(std::string_view str, size_t index,
32+
const std::vector<std::string_view> &searches);
3333

34-
EXPORT [[nodiscard]] bool startsWith(std::string_view str, std::string_view search);
34+
EXPORT bool startsWith(std::string_view str, std::string_view search);
3535

36-
EXPORT [[nodiscard]] std::vector<std::string_view> split(std::string_view str, std::string_view divider);
36+
EXPORT std::vector<std::string_view> split(std::string_view str, std::string_view divider);
3737

38-
EXPORT [[nodiscard]] std::vector<std::string_view> split(std::string_view str,
39-
const std::vector<std::string_view> &dividers);
38+
EXPORT std::vector<std::string_view> split(std::string_view str, const std::vector<std::string_view> &dividers);
4039

41-
EXPORT [[nodiscard]] std::optional<std::pair<std::string_view, std::string_view>> tryBreak(
40+
EXPORT std::optional<std::pair<std::string_view, std::string_view>> tryBreak(
4241
std::string_view str, const std::vector<std::string_view> &dividers);
4342

44-
EXPORT [[nodiscard]] std::optional<std::pair<std::string_view, std::string_view>> tryBreakFromEnd(
43+
EXPORT std::optional<std::pair<std::string_view, std::string_view>> tryBreakFromEnd(
4544
std::string_view str, const std::vector<std::string_view> &dividers);
4645

47-
EXPORT [[nodiscard]] std::string joinViews(const std::vector<std::string_view> &strings,
48-
const std::string &divider);
46+
EXPORT std::string joinViews(const std::vector<std::string_view> &strings, const std::string &divider);
4947

5048
template <class T> void assertPtr(const T *ptr)
5149
{
@@ -59,7 +57,7 @@ namespace sb::cf::details::utils
5957

6058
template <class T> void assertPtr(const std::shared_ptr<T> &ptr) { assertPtr(ptr.get()); }
6159

62-
template <class TNumber> [[nodiscard]] std::pair<bool, TNumber> tryStringTo(std::string_view str, bool full = true)
60+
template <class TNumber> std::pair<bool, TNumber> tryStringTo(std::string_view str, bool full = true)
6361
{
6462
TNumber number = 0;
6563
while (!str.empty() && std::isspace(str.front()))
@@ -72,7 +70,7 @@ namespace sb::cf::details::utils
7270
return {success, number};
7371
}
7472

75-
template <> [[nodiscard]] inline std::pair<bool, double> tryStringTo<double>(std::string_view str, bool full)
73+
template <> inline std::pair<bool, double> tryStringTo<double>(std::string_view str, bool full)
7674
{
7775
try
7876
{
@@ -88,7 +86,7 @@ namespace sb::cf::details::utils
8886
}
8987
}
9088

91-
template <> [[nodiscard]] inline std::pair<bool, bool> tryStringTo<bool>(std::string_view str, bool full)
89+
template <> inline std::pair<bool, bool> tryStringTo<bool>(std::string_view str, bool full)
9290
{
9391
if (ignoreCaseEqual(str, "true"))
9492
{
@@ -105,7 +103,7 @@ namespace sb::cf::details::utils
105103
return {false, false};
106104
}
107105

108-
template <class TNumber> [[nodiscard]] TNumber stringTo(std::string_view str, bool full = true)
106+
template <class TNumber> TNumber stringTo(std::string_view str, bool full = true)
109107
{
110108
if (auto [success, number] = tryStringTo<TNumber>(str, full); success)
111109
{

0 commit comments

Comments
 (0)