Browse Source

Silence a couple warnings

pull/8/head
falkTX 7 years ago
parent
commit
7589cd540f
7 changed files with 23 additions and 5 deletions
  1. +5
    -0
      modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
  2. +6
    -0
      modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp
  3. +2
    -2
      modules/juce_core/native/juce_linux_Files.cpp
  4. +2
    -0
      modules/juce_core/native/juce_posix_SharedCode.h
  5. +1
    -1
      modules/juce_core/xml/juce_XmlElement.cpp
  6. +1
    -1
      modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
  7. +6
    -1
      modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp

+ 5
- 0
modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp View File

@@ -117,6 +117,9 @@ namespace FlacNamespace
#pragma clang diagnostic ignored "-Wconversion"
#pragma clang diagnostic ignored "-Wshadow"
#pragma clang diagnostic ignored "-Wdeprecated-register"
#elif JUCE_GCC && (__GNUC__ >= 7)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif
#if JUCE_INTEL
@@ -157,6 +160,8 @@ namespace FlacNamespace
#if JUCE_CLANG
#pragma clang diagnostic pop
#elif JUCE_GCC && (__GNUC__ >= 7)
#pragma GCC diagnostic pop
#endif
}


+ 6
- 0
modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp View File

@@ -47,6 +47,12 @@ namespace OggVorbisNamespace
#elif JUCE_GCC
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#if (__GNUC__ >= 6)
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#if (__GNUC__ >= 7)
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif
#endif
#endif
#include "oggvorbis/vorbisenc.h"


+ 2
- 2
modules/juce_core/native/juce_linux_Files.cpp View File

@@ -136,14 +136,14 @@ File File::getSpecialLocation (const SpecialLocationType type)
case invokedExecutableFile:
if (juce_argv != nullptr && juce_argc > 0)
return File (CharPointer_UTF8 (juce_argv[0]));
// deliberate fall-through...
// fall-through
case currentExecutableFile:
case currentApplicationFile:
#if ! JUCE_STANDALONE_APPLICATION
return juce_getExecutableFile();
#endif
// deliberate fall-through if this is not a shared-library
// fall-through
case hostApplicationPath:
{


+ 2
- 0
modules/juce_core/native/juce_posix_SharedCode.h View File

@@ -1205,6 +1205,8 @@ public:
close (pipeHandles[1]); // close the write handle
}
}
ignoreUnused (streamFlags);
}
~ActiveProcess()


+ 1
- 1
modules/juce_core/xml/juce_XmlElement.cpp View File

@@ -241,7 +241,7 @@ namespace XmlOutputFunctions
outputStream << (char) character;
break;
}
// Note: deliberate fall-through here!
// fall-through
default:
outputStream << "&#" << ((int) character) << ';';
break;


+ 1
- 1
modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp View File

@@ -92,7 +92,7 @@ private:
{
case Z_STREAM_END:
finished = true;
// Deliberate fall-through..
// fall-through..
case Z_OK:
{
data += dataSize - stream.avail_in;


+ 6
- 1
modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp View File

@@ -39,6 +39,9 @@ namespace zlibNamespace
#if __has_warning("-Wcomma")
#pragma clang diagnostic ignored "-Wcomma"
#endif
#elif JUCE_GCC && (__GNUC__ >= 7)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif
#undef OS_CODE
@@ -74,6 +77,8 @@ namespace zlibNamespace
#if JUCE_CLANG
#pragma clang diagnostic pop
#elif JUCE_GCC && (__GNUC__ >= 7)
#pragma GCC diagnostic pop
#endif
#else
#include JUCE_ZLIB_INCLUDE_PATH
@@ -136,7 +141,7 @@ public:
{
case Z_STREAM_END:
finished = true;
// deliberate fall-through
// fall-through
case Z_OK:
data += dataSize - stream.avail_in;
dataSize = (z_uInt) stream.avail_in;


Loading…
Cancel
Save