Skip to content

Commit 83d7539

Browse files
committed
Fix MSVC compiler warnings
1 parent d90ab21 commit 83d7539

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

Source/Objects/IEMHelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ static int srl_is_valid(t_symbol const* s)
1212
}
1313

1414
extern "C" {
15-
char* pdgui_strnescape(char* dst, size_t dstlen, char const* src, size_t srclen);
15+
EXTERN char* pdgui_strnescape(char* dst, size_t dstlen, char const* src, size_t srclen);
1616
}
1717

1818
class IEMHelper {

Source/Pd/Instance.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ConsoleMessageHandler final : public Timer {
4646
{
4747
if (consoleMessages.size()) {
4848
auto& [lastObject, lastMessage, lastType, lastLength, numMessages] = consoleMessages.back();
49-
if (object == lastObject && message == lastMessage && type == lastType) {
49+
if (object == lastObject && message == lastMessage && static_cast<int>(type) == lastType) {
5050
numMessages++;
5151
} else {
5252
consoleMessages.emplace_back(object, message, type, CachedStringWidth<14>::calculateStringWidth(message) + 40, 1);
@@ -145,7 +145,7 @@ class ConsoleMessageHandler final : public Timer {
145145
}
146146
}
147147

148-
StackArray<char, 2048> printConcatBuffer;
148+
StackArray<char, 2048> printConcatBuffer = {};
149149

150150
moodycamel::ConcurrentQueue<std::tuple<void*, SmallString, bool>> pendingMessages = moodycamel::ConcurrentQueue<std::tuple<void*, SmallString, bool>>(512);
151151
};
@@ -156,7 +156,7 @@ struct Instance::dmessage {
156156
: object(ref, instance)
157157
, destination(dest)
158158
, selector(sel)
159-
, list(std::move(atoms))
159+
, list(atoms)
160160
{
161161
}
162162

Source/Utility/Containers.h

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
# define GSL_OWNER
3838
#endif
3939

40+
#ifndef __has_builtin
41+
# define __has_builtin(x) 0
42+
#endif
43+
4044
#if __has_builtin(__builtin_expect) || defined(__GNUC__)
4145
# define EXPECT_LIKELY(EXPR) __builtin_expect((bool)(EXPR), true)
4246
# define EXPECT_UNLIKELY(EXPR) __builtin_expect((bool)(EXPR), false)
@@ -45,10 +49,10 @@
4549
# define EXPECT_UNLIKELY(EXPR) (EXPR)
4650
#endif
4751

48-
#if __has_attribute(returns_nonnull)
49-
# define ATTRIBUTE_RETURNS_NONNULL __attribute__((returns_nonnull))
50-
#elif defined(_MSC_VER)
52+
#if defined(_MSC_VER)
5153
# define ATTRIBUTE_RETURNS_NONNULL _Ret_notnull_
54+
#elif __has_attribute(returns_nonnull)
55+
# define ATTRIBUTE_RETURNS_NONNULL __attribute__((returns_nonnull))
5256
#else
5357
# define LLVM_ATTRIBUTE_RETURNS_NONNULL
5458
#endif
@@ -1217,9 +1221,9 @@ class SmallArrayImpl : public SmallArrayTemplateBase<T> {
12171221
return this->back();
12181222
}
12191223

1220-
SmallArrayImpl& operator=(SmallArrayImpl const& RHS);
1224+
SmallArrayImpl& operator=(SmallArrayImpl const& RHS) noexcept;
12211225

1222-
SmallArrayImpl& operator=(SmallArrayImpl&& RHS);
1226+
SmallArrayImpl& operator=(SmallArrayImpl&& RHS) noexcept;
12231227

12241228
bool operator==(SmallArrayImpl const& RHS) const
12251229
{
@@ -1283,7 +1287,7 @@ void SmallArrayImpl<T>::swap(SmallArrayImpl<T>& RHS)
12831287

12841288
template<typename T>
12851289
SmallArrayImpl<T>& SmallArrayImpl<T>::
1286-
operator=(SmallArrayImpl<T> const& RHS)
1290+
operator=(SmallArrayImpl<T> const& RHS) noexcept
12871291
{
12881292
// Avoid self-assignment.
12891293
if (this == &RHS)
@@ -1332,7 +1336,7 @@ operator=(SmallArrayImpl<T> const& RHS)
13321336
}
13331337

13341338
template<typename T>
1335-
SmallArrayImpl<T>& SmallArrayImpl<T>::operator=(SmallArrayImpl<T>&& RHS)
1339+
SmallArrayImpl<T>& SmallArrayImpl<T>::operator=(SmallArrayImpl<T>&& RHS) noexcept
13361340
{
13371341
// Avoid self-assignment.
13381342
if (this == &RHS)
@@ -1537,7 +1541,7 @@ class GSL_OWNER SmallArray : public SmallArrayImpl<T>
15371541
return *this;
15381542
}
15391543

1540-
SmallArray(SmallArray&& RHS)
1544+
SmallArray(SmallArray&& RHS) noexcept
15411545
: SmallArrayImpl<T>(N)
15421546
{
15431547
if (!RHS.empty())
@@ -1551,7 +1555,7 @@ class GSL_OWNER SmallArray : public SmallArrayImpl<T>
15511555
SmallArrayImpl<T>::operator=(::std::move(RHS));
15521556
}
15531557

1554-
SmallArray& operator=(SmallArray&& RHS)
1558+
SmallArray& operator=(SmallArray&& RHS) noexcept
15551559
{
15561560
if (N) {
15571561
SmallArrayImpl<T>::operator=(::std::move(RHS));

Source/Utility/SettingsFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class SettingsFile final : public ValueTree::Listener
121121
ValueTree settingsTree = ValueTree("SettingsTree");
122122
bool settingsChangedInternally = false;
123123
bool settingsChangedExternally = false;
124-
int64 lastContentHash;
124+
int64 lastContentHash = 0;
125125
static constexpr int64 saveTimeoutMs = 100;
126126
static constexpr int64 lockTimeoutMs = 5000;
127127

0 commit comments

Comments
 (0)