Browse Source

Removed a few compiler warnings

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
aa98aa03ec
4 changed files with 23 additions and 2 deletions
  1. +7
    -0
      juce_Config.h
  2. +7
    -0
      juce_amalgamated.cpp
  3. +8
    -1
      juce_amalgamated.h
  4. +1
    -1
      src/containers/juce_Variant.h

+ 7
- 0
juce_Config.h View File

@@ -274,12 +274,19 @@
//=============================================================================
// If only building the core classes, we can explicitly turn off some features to avoid including them:
#if JUCE_ONLY_BUILD_CORE_LIBRARY
#undef JUCE_QUICKTIME
#define JUCE_QUICKTIME 0
#undef JUCE_OPENGL
#define JUCE_OPENGL 0
#undef JUCE_USE_CDBURNER
#define JUCE_USE_CDBURNER 0
#undef JUCE_USE_CDREADER
#define JUCE_USE_CDREADER 0
#undef JUCE_WEB_BROWSER
#define JUCE_WEB_BROWSER 0
#undef JUCE_PLUGINHOST_AU
#define JUCE_PLUGINHOST_AU 0
#undef JUCE_PLUGINHOST_VST
#define JUCE_PLUGINHOST_VST 0
#endif


+ 7
- 0
juce_amalgamated.cpp View File

@@ -408,12 +408,19 @@

// If only building the core classes, we can explicitly turn off some features to avoid including them:
#if JUCE_ONLY_BUILD_CORE_LIBRARY
#undef JUCE_QUICKTIME
#define JUCE_QUICKTIME 0
#undef JUCE_OPENGL
#define JUCE_OPENGL 0
#undef JUCE_USE_CDBURNER
#define JUCE_USE_CDBURNER 0
#undef JUCE_USE_CDREADER
#define JUCE_USE_CDREADER 0
#undef JUCE_WEB_BROWSER
#define JUCE_WEB_BROWSER 0
#undef JUCE_PLUGINHOST_AU
#define JUCE_PLUGINHOST_AU 0
#undef JUCE_PLUGINHOST_VST
#define JUCE_PLUGINHOST_VST 0
#endif



+ 8
- 1
juce_amalgamated.h View File

@@ -442,12 +442,19 @@

// If only building the core classes, we can explicitly turn off some features to avoid including them:
#if JUCE_ONLY_BUILD_CORE_LIBRARY
#undef JUCE_QUICKTIME
#define JUCE_QUICKTIME 0
#undef JUCE_OPENGL
#define JUCE_OPENGL 0
#undef JUCE_USE_CDBURNER
#define JUCE_USE_CDBURNER 0
#undef JUCE_USE_CDREADER
#define JUCE_USE_CDREADER 0
#undef JUCE_WEB_BROWSER
#define JUCE_WEB_BROWSER 0
#undef JUCE_PLUGINHOST_AU
#define JUCE_PLUGINHOST_AU 0
#undef JUCE_PLUGINHOST_VST
#define JUCE_PLUGINHOST_VST 0
#endif

@@ -9318,8 +9325,8 @@ public:

bool operator== (const identifier& other) const throw()
{
return hashCode == other.hashCode;
jassert (hashCode != other.hashCode || name == other.name); // check for name hash collisions
return hashCode == other.hashCode;
}

String name;


+ 1
- 1
src/containers/juce_Variant.h View File

@@ -119,8 +119,8 @@ public:
bool operator== (const identifier& other) const throw()
{
return hashCode == other.hashCode;
jassert (hashCode != other.hashCode || name == other.name); // check for name hash collisions
return hashCode == other.hashCode;
}
String name;


Loading…
Cancel
Save