Skip to content

Commit eaa76be

Browse files
committed
fix warnings
1 parent e18074a commit eaa76be

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

3rdparty/minitrace/minitrace.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <stdlib.h>
99
#include <stdio.h>
1010
#include <string.h>
11+
#include <atomic>
1112

1213
#ifdef _WIN32
1314
#pragma warning (disable:4996)
@@ -59,7 +60,7 @@ typedef struct raw_event {
5960

6061
static raw_event_t *event_buffer;
6162
static raw_event_t *flush_buffer;
62-
static volatile int event_count;
63+
static std::atomic_int event_count;
6364
static int is_tracing = FALSE;
6465
static int is_flushing = FALSE;
6566
static int events_in_progress = 0;

tests/gtest_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ TEST(
354354
BehaviorTreeFactory factory;
355355

356356
factory.registerBehaviorTreeFromText(xmlA);
357-
EXPECT_ANY_THROW(factory.createTree("Wrong Name"));
357+
EXPECT_ANY_THROW(auto tree = factory.createTree("Wrong Name"));
358358
}
359359

360360
TEST(BehaviorTreeReload, ReloadSameTree)

0 commit comments

Comments
 (0)