Skip to content

Commit d519316

Browse files
committed
Merge branch 'main' into dev
2 parents 5d46ee4 + 048b55c commit d519316

File tree

10 files changed

+4
-15
lines changed

10 files changed

+4
-15
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ namespace cpptrace {
384384
formatter& filtered_frame_placeholders(bool);
385385
formatter& filter(std::function<bool(const stacktrace_frame&)>);
386386
formatter& transform(std::function<stacktrace_frame(stacktrace_frame)>);
387+
formatter& break_before_filename(bool do_break = true);
387388

388389
std::string format(const stacktrace_frame&) const;
389390
std::string format(const stacktrace_frame&, bool color) const;
@@ -422,6 +423,7 @@ Options:
422423
| `filtered_frame_placeholders` | Whether to still print filtered frames as just `#n (filtered)` | `true` |
423424
| `filter` | A predicate to filter frames with | None |
424425
| `transform` | A transformer which takes a stacktrace frame and modifies it | None |
426+
| `break_before_filename` | Print symbol and line source location on different lines | `false` |
425427
426428
The `automatic` color mode attempts to detect if a stream that may be attached to a terminal. As such, it will not use
427429
colors for the `formatter::format` method and it may not be able to detect if some ostreams correspond to terminals or

test/unit/internals/general.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ int counting_helper::active = 0;
190190

191191
TEST(MaybeOwnedTest, NonOwningPointer) {
192192
ASSERT_EQ(counting_helper::active, 0);
193-
auto instance = std::make_unique<counting_helper>(42);
193+
auto instance = cpptrace::detail::make_unique<counting_helper>(42);
194194
EXPECT_EQ(counting_helper::active, 1);
195195
{
196196
maybe_owned<counting_helper> non_owning(instance.get());
@@ -204,7 +204,7 @@ TEST(MaybeOwnedTest, NonOwningPointer) {
204204

205205
TEST(MaybeOwnedTest, OwningPointer) {
206206
ASSERT_EQ(counting_helper::active, 0);
207-
auto instance = std::make_unique<counting_helper>(42);
207+
auto instance = cpptrace::detail::make_unique<counting_helper>(42);
208208
EXPECT_EQ(counting_helper::active, 1);
209209
{
210210
maybe_owned<counting_helper> non_owning(std::move(instance));

test/unit/tracing/from_current.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import cpptrace;
1818
#include <cpptrace/from_current.hpp>
1919
#endif
2020

21-
using namespace std::literals;
22-
2321

2422
static volatile int truthy = 2;
2523

test/unit/tracing/from_current_try_catch.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import cpptrace;
1515
#include <cpptrace/from_current.hpp>
1616
#endif
1717

18-
using namespace std::literals;
19-
2018

2119
static volatile int truthy = 2;
2220

test/unit/tracing/object_trace.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import cpptrace;
1414
#include <cpptrace/cpptrace.hpp>
1515
#endif
1616

17-
using namespace std::literals;
18-
19-
2017

2118
TEST(ObjectTrace, Empty) {
2219
cpptrace::object_trace empty;

test/unit/tracing/raw_trace.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import cpptrace;
1414
#include <cpptrace/cpptrace.hpp>
1515
#endif
1616

17-
using namespace std::literals;
1817

1918
// Raw trace tests
2019

test/unit/tracing/rethrow.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import cpptrace;
1818
#include <cpptrace/from_current.hpp>
1919
#endif
2020

21-
using namespace std::literals;
2221

2322
static volatile int truthy = 2;
2423

test/unit/tracing/stacktrace.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import cpptrace;
1313
#include <cpptrace/cpptrace.hpp>
1414
#endif
1515

16-
using namespace std::literals;
1716

1817
#ifdef _MSC_VER
1918
#define CPPTRACE_FORCE_INLINE [[msvc::flatten]]

test/unit/tracing/traced_exception.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import cpptrace;
1313
#include <cpptrace/cpptrace.hpp>
1414
#endif
1515

16-
using namespace std::literals;
17-
1816

1917
static volatile int truthy = 2;
2018

test/unit/tracing/try_catch.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import cpptrace;
2020
#include "cpptrace/basic.hpp"
2121
#endif
2222

23-
using namespace std::literals;
2423

2524
namespace {
2625
template<typename E, typename... Args>

0 commit comments

Comments
 (0)