Browse Source

Avoided a few compiler warnings.

tags/2021-05-28
jules 11 years ago
parent
commit
50a55b2e9c
12 changed files with 17 additions and 17 deletions
  1. +1
    -1
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  2. +2
    -2
      modules/juce_events/native/juce_linux_Messaging.cpp
  3. +1
    -1
      modules/juce_graphics/fonts/juce_Font.cpp
  4. +2
    -2
      modules/juce_graphics/images/juce_ImageCache.cpp
  5. +1
    -1
      modules/juce_graphics/native/juce_freetype_Fonts.cpp
  6. +1
    -1
      modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
  7. +1
    -1
      modules/juce_gui_basics/components/juce_ModalComponentManager.h
  8. +2
    -2
      modules/juce_gui_basics/native/juce_mac_Windowing.mm
  9. +2
    -2
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  10. +1
    -1
      modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp
  11. +1
    -1
      modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
  12. +2
    -2
      modules/juce_video/native/juce_win32_DirectShowComponent.cpp

+ 1
- 1
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp View File

@@ -221,7 +221,7 @@ public:
{} {}
} }
juce_DeclareSingleton (SharedMessageThread, false);
juce_DeclareSingleton (SharedMessageThread, false)
private: private:
bool initialised; bool initialised;


+ 2
- 2
modules/juce_events/native/juce_linux_Messaging.cpp View File

@@ -131,7 +131,7 @@ public:
} }
//============================================================================== //==============================================================================
juce_DeclareSingleton_SingleThreaded_Minimal (InternalMessageQueue);
juce_DeclareSingleton_SingleThreaded_Minimal (InternalMessageQueue)
private: private:
CriticalSection lock; CriticalSection lock;
@@ -209,7 +209,7 @@ private:
} }
}; };
juce_ImplementSingleton_SingleThreaded (InternalMessageQueue);
juce_ImplementSingleton_SingleThreaded (InternalMessageQueue)
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_graphics/fonts/juce_Font.cpp View File

@@ -51,7 +51,7 @@ public:
clearSingletonInstance(); clearSingletonInstance();
} }
juce_DeclareSingleton (TypefaceCache, false);
juce_DeclareSingleton (TypefaceCache, false)
void setSize (const int numToCache) void setSize (const int numToCache)
{ {


+ 2
- 2
modules/juce_graphics/images/juce_ImageCache.cpp View File

@@ -110,7 +110,7 @@ public:
unsigned int cacheTimeout; unsigned int cacheTimeout;
juce_DeclareSingleton_SingleThreaded_Minimal (ImageCache::Pimpl);
juce_DeclareSingleton_SingleThreaded_Minimal (ImageCache::Pimpl)
private: private:
OwnedArray<Item> images; OwnedArray<Item> images;
@@ -119,7 +119,7 @@ private:
JUCE_DECLARE_NON_COPYABLE (Pimpl) JUCE_DECLARE_NON_COPYABLE (Pimpl)
}; };
juce_ImplementSingleton_SingleThreaded (ImageCache::Pimpl);
juce_ImplementSingleton_SingleThreaded (ImageCache::Pimpl)
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_graphics/native/juce_freetype_Fonts.cpp View File

@@ -224,7 +224,7 @@ public:
sansSerif.addIfNotAlreadyThere (faces.getUnchecked(i)->family); sansSerif.addIfNotAlreadyThere (faces.getUnchecked(i)->family);
} }
juce_DeclareSingleton_SingleThreaded_Minimal (FTTypefaceList);
juce_DeclareSingleton_SingleThreaded_Minimal (FTTypefaceList)
private: private:
FTLibWrapper::Ptr library; FTLibWrapper::Ptr library;


+ 1
- 1
modules/juce_gui_basics/components/juce_ModalComponentManager.cpp View File

@@ -89,7 +89,7 @@ ModalComponentManager::~ModalComponentManager()
clearSingletonInstance(); clearSingletonInstance();
} }
juce_ImplementSingleton_SingleThreaded (ModalComponentManager);
juce_ImplementSingleton_SingleThreaded (ModalComponentManager)
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_gui_basics/components/juce_ModalComponentManager.h View File

@@ -120,7 +120,7 @@ public:
#endif #endif
//============================================================================== //==============================================================================
juce_DeclareSingleton_SingleThreaded_Minimal (ModalComponentManager);
juce_DeclareSingleton_SingleThreaded_Minimal (ModalComponentManager)
protected: protected:
/** Creates a ModalComponentManager. /** Creates a ModalComponentManager.


+ 2
- 2
modules/juce_gui_basics/native/juce_mac_Windowing.mm View File

@@ -332,13 +332,13 @@ public:
const_cast <Desktop::Displays&> (Desktop::getInstance().getDisplays()).refresh(); const_cast <Desktop::Displays&> (Desktop::getInstance().getDisplays()).refresh();
} }
juce_DeclareSingleton_SingleThreaded_Minimal (DisplaySettingsChangeCallback);
juce_DeclareSingleton_SingleThreaded_Minimal (DisplaySettingsChangeCallback)
private: private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DisplaySettingsChangeCallback) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DisplaySettingsChangeCallback)
}; };
juce_ImplementSingleton_SingleThreaded (DisplaySettingsChangeCallback);
juce_ImplementSingleton_SingleThreaded (DisplaySettingsChangeCallback)
static Rectangle<int> convertDisplayRect (NSRect r, CGFloat mainScreenBottom) static Rectangle<int> convertDisplayRect (NSRect r, CGFloat mainScreenBottom)
{ {


+ 2
- 2
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -1226,7 +1226,7 @@ private:
LPCTSTR getWindowClassName() const noexcept { return (LPCTSTR) MAKELONG (atom, 0); } LPCTSTR getWindowClassName() const noexcept { return (LPCTSTR) MAKELONG (atom, 0); }
juce_DeclareSingleton_SingleThreaded_Minimal (WindowClassHolder);
juce_DeclareSingleton_SingleThreaded_Minimal (WindowClassHolder)
private: private:
ATOM atom; ATOM atom;
@@ -2939,7 +2939,7 @@ ComponentPeer* createNonRepaintingEmbeddedWindowsPeer (Component& component, voi
} }
juce_ImplementSingleton_SingleThreaded (HWNDComponentPeer::WindowClassHolder);
juce_ImplementSingleton_SingleThreaded (HWNDComponentPeer::WindowClassHolder)
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp View File

@@ -36,7 +36,7 @@ public:
clearSingletonInstance(); clearSingletonInstance();
} }
juce_DeclareSingleton_SingleThreaded_Minimal (TopLevelWindowManager);
juce_DeclareSingleton_SingleThreaded_Minimal (TopLevelWindowManager)
void checkFocusAsync() void checkFocusAsync()
{ {


+ 1
- 1
modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm View File

@@ -81,7 +81,7 @@ private:
target->viewResized(); target->viewResized();
} }
JUCE_DECLARE_NON_COPYABLE (ViewFrameChangeCallbackClass);
JUCE_DECLARE_NON_COPYABLE (ViewFrameChangeCallbackClass)
}; };
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NSViewResizeWatcher) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NSViewResizeWatcher)


+ 2
- 2
modules/juce_video/native/juce_win32_DirectShowComponent.cpp View File

@@ -530,7 +530,7 @@ private:
bool isRegistered() const noexcept { return atom != 0; } bool isRegistered() const noexcept { return atom != 0; }
LPCTSTR getWindowClassName() const noexcept { return (LPCTSTR) MAKELONG (atom, 0); } LPCTSTR getWindowClassName() const noexcept { return (LPCTSTR) MAKELONG (atom, 0); }
juce_DeclareSingleton_SingleThreaded_Minimal (NativeWindowClass);
juce_DeclareSingleton_SingleThreaded_Minimal (NativeWindowClass)
private: private:
NativeWindowClass() NativeWindowClass()
@@ -724,7 +724,7 @@ private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectShowContext) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectShowContext)
}; };
juce_ImplementSingleton_SingleThreaded (DirectShowComponent::DirectShowContext::NativeWindowClass);
juce_ImplementSingleton_SingleThreaded (DirectShowComponent::DirectShowContext::NativeWindowClass)
//====================================================================== //======================================================================


Loading…
Cancel
Save