Skip to content

Commit 9b13c5c

Browse files
authored
Merge pull request #330 from mihaibuzgau/main
(PA-3604) update code to compile with new compilers
2 parents 4af8867 + 162559c commit 9b13c5c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

util/inc/leatherman/util/scope_exit.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#pragma once
66

77
#include <functional>
8+
#include <cstddef>
89

910
namespace leatherman { namespace util {
1011

@@ -51,9 +52,9 @@ namespace leatherman { namespace util {
5152
private:
5253
explicit scope_exit(scope_exit const&) = delete;
5354
scope_exit& operator=(scope_exit const&) = delete;
54-
void* operator new(size_t) = delete;
55+
void* operator new(std::size_t) = delete;
5556
void operator delete(void*) = delete;
56-
void* operator new[](size_t) = delete;
57+
void* operator new[](std::size_t) = delete;
5758
void operator delete[](void* ptr) = delete;
5859

5960
std::function<void()> _callback;

util/inc/leatherman/util/scoped_resource.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#pragma once
66

77
#include <functional>
8+
#include <cstddef>
89

910
namespace leatherman { namespace util {
1011
/**
@@ -121,9 +122,9 @@ namespace leatherman { namespace util {
121122
std::function<void(T&)> _deleter;
122123

123124
private:
124-
void* operator new(size_t) = delete;
125+
void* operator new(std::size_t) = delete;
125126
void operator delete(void*) = delete;
126-
void* operator new[](size_t) = delete;
127+
void* operator new[](std::size_t) = delete;
127128
void operator delete[](void* ptr) = delete;
128129
};
129130

0 commit comments

Comments
 (0)