diff --git a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c index f506d454d7..49bac8c9f0 100644 --- a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c +++ b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c @@ -15,10 +15,15 @@ ********************************************************************/ -#ifdef JUCE_MSVC +#if JUCE_MSVC #pragma warning (disable: 4456 4457 4459) #endif +#if JUCE_GCC + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmisleading-indentation" +#endif + #include #include #include @@ -2347,3 +2352,7 @@ int ov_time_seek_lap(OggVorbis_File *vf,double pos){ int ov_time_seek_page_lap(OggVorbis_File *vf,double pos){ return _ov_d_seek_lap(vf,pos,ov_time_seek_page); } + +#if JUCE_GCC + #pragma GCC diagnostic pop +#endif diff --git a/modules/juce_core/misc/juce_StdFunctionCompat.cpp b/modules/juce_core/misc/juce_StdFunctionCompat.cpp index 035aeeeeed..f0012e9892 100644 --- a/modules/juce_core/misc/juce_StdFunctionCompat.cpp +++ b/modules/juce_core/misc/juce_StdFunctionCompat.cpp @@ -225,8 +225,8 @@ public: if (f1) expect (false); - std::function f2 ([]() { return 11; }); - f2 = nullptr; + std::function f2 ([]() { return 11; }); + f2 = nullptr; if (f2) expect (false); } diff --git a/modules/juce_core/native/juce_win32_SystemStats.cpp b/modules/juce_core/native/juce_win32_SystemStats.cpp index 1ca14ded54..7931d9cbaa 100644 --- a/modules/juce_core/native/juce_win32_SystemStats.cpp +++ b/modules/juce_core/native/juce_win32_SystemStats.cpp @@ -20,6 +20,11 @@ ============================================================================== */ +#if ! JUCE_MINGW + #pragma intrinsic (__cpuid) + #pragma intrinsic (__rdtsc) +#endif + void Logger::outputDebugString (const String& text) { OutputDebugString ((text + "\n").toWideCharPointer()); @@ -32,8 +37,6 @@ void Logger::outputDebugString (const String& text) #endif //============================================================================== -#pragma intrinsic (__cpuid) -#pragma intrinsic (__rdtsc) #if JUCE_MINGW static void callCPUID (int result[4], uint32 type) @@ -84,7 +87,7 @@ String SystemStats::getCpuModel() const int numExtIDs = info[0]; - if (numExtIDs < 0x80000004) // if brand string is unsupported + if ((unsigned) numExtIDs < 0x80000004) // if brand string is unsupported return {}; callCPUID (info, 0x80000002); diff --git a/modules/juce_core/network/juce_Socket.cpp b/modules/juce_core/network/juce_Socket.cpp index 1ece6a1303..19723b69b4 100644 --- a/modules/juce_core/network/juce_Socket.cpp +++ b/modules/juce_core/network/juce_Socket.cpp @@ -100,7 +100,7 @@ namespace SocketHelpers #if JUCE_WINDOWS ignoreUnused (portNumber, isListener, readLock); - if (h != SOCKET_ERROR || connected) + if (h != (unsigned) SOCKET_ERROR || connected) closesocket (h); // make sure any read process finishes before we delete the socket diff --git a/modules/juce_cryptography/encryption/juce_BlowFish.h b/modules/juce_cryptography/encryption/juce_BlowFish.h index a377030e0a..dfa50dd88d 100644 --- a/modules/juce_cryptography/encryption/juce_BlowFish.h +++ b/modules/juce_cryptography/encryption/juce_BlowFish.h @@ -97,7 +97,7 @@ private: static int pad (void*, size_t, size_t) noexcept; static int unpad (const void*, size_t) noexcept; - bool apply (void*, size_t, void (BlowFish::*op) (uint32&, uint32&) const noexcept) const; + bool apply (void*, size_t, void (BlowFish::*op) (uint32&, uint32&) const) const; //============================================================================== uint32 p[18]; diff --git a/modules/juce_graphics/colour/juce_Colour.cpp b/modules/juce_graphics/colour/juce_Colour.cpp index 14c99e8ce4..ae73b07614 100644 --- a/modules/juce_graphics/colour/juce_Colour.cpp +++ b/modules/juce_graphics/colour/juce_Colour.cpp @@ -103,7 +103,7 @@ namespace ColourHelpers if (h < 3.0f) return PixelARGB (alpha, x, intV, (uint8) roundToInt (v * (1.0f - (s * (1.0f - f))))); if (h < 4.0f) return PixelARGB (alpha, x, (uint8) roundToInt (v * (1.0f - s * f)), intV); if (h < 5.0f) return PixelARGB (alpha, (uint8) roundToInt (v * (1.0f - (s * (1.0f - f)))), x, intV); - return PixelARGB (alpha, intV, x, (uint8) roundToInt (v * (1.0f - s * f))); + return PixelARGB (alpha, intV, x, (uint8) roundToInt (v * (1.0f - s * f))); } float hue, saturation, brightness; diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h index 24f06b096e..bd5f8c09e6 100644 --- a/modules/juce_gui_basics/juce_gui_basics.h +++ b/modules/juce_gui_basics/juce_gui_basics.h @@ -178,7 +178,6 @@ class FlexBox; #include "mouse/juce_DragAndDropContainer.h" #include "mouse/juce_FileDragAndDropTarget.h" #include "mouse/juce_SelectedItemSet.h" -#include "mouse/juce_LassoComponent.h" #include "mouse/juce_MouseInactivityDetector.h" #include "mouse/juce_TextDragAndDropTarget.h" #include "mouse/juce_TooltipClient.h" @@ -286,6 +285,7 @@ class FlexBox; #include "lookandfeel/juce_LookAndFeel_V1.h" #include "lookandfeel/juce_LookAndFeel_V3.h" #include "lookandfeel/juce_LookAndFeel_V4.h" +#include "mouse/juce_LassoComponent.h" #if JUCE_LINUX #include "native/juce_linux_X11.h" diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 1dd3a04e77..569c400131 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -788,7 +788,7 @@ struct UWPUIViewSettings auto status = roInitialize (1); - if (status != S_OK && status != S_FALSE && status != 0x80010106L) + if (status != S_OK && status != S_FALSE && (unsigned) status != 0x80010106L) return; LPCWSTR uwpClassName = L"Windows.UI.ViewManagement.UIViewSettings"; diff --git a/modules/juce_video/juce_video.cpp b/modules/juce_video/juce_video.cpp index fb03f18591..6edb8a60d6 100644 --- a/modules/juce_video/juce_video.cpp +++ b/modules/juce_video/juce_video.cpp @@ -45,7 +45,7 @@ #import //============================================================================== -#elif JUCE_WINDOWS +#elif JUCE_MSVC /* If you're using the camera classes, you'll need access to a few DirectShow headers. These files are provided in the normal Windows SDK. */ #include diff --git a/modules/juce_video/playback/juce_VideoComponent.cpp b/modules/juce_video/playback/juce_VideoComponent.cpp index 9346a75d42..4b44280d4d 100644 --- a/modules/juce_video/playback/juce_VideoComponent.cpp +++ b/modules/juce_video/playback/juce_VideoComponent.cpp @@ -22,7 +22,7 @@ ============================================================================== */ -#if JUCE_MAC || JUCE_IOS || JUCE_WINDOWS || JUCE_ANDROID +#if JUCE_MAC || JUCE_IOS || JUCE_MSVC || JUCE_ANDROID #if JUCE_MAC || JUCE_IOS #include "../native/juce_mac_Video.h"