mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-27 02:20:05 +00:00
Code Activity

Fixed a compiler warning involving deprecated static variables when compiling with GCC

Browse source
This commit is contained in:
hogliux 2017-10-11 12:16:33 +01:00
parent 369d59f656
commit 1135f6fff6
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_core/files/juce_File.h
View file

@ -35,7 +35,7 @@ namespace juce
@see FileInputStream, FileOutputStream
*/
class JUCE_API File final
class JUCE_API File final
{
public:
//==============================================================================
@ -1027,7 +1027,7 @@ public:
bool foldersFirst;
};
#ifndef DOXYGEN
#if (! defined(DOXYGEN)) && (! defined (JUCE_GCC))
// Deprecated: use File::getSeparatorChar() and File::getSeparatorString() instead!
JUCE_DEPRECATED (static const juce_wchar separator);
JUCE_DEPRECATED (static const StringRef separatorString);

6
modules/juce_core/native/juce_posix_SharedCode.h
View file

@ -187,8 +187,10 @@ static MaxNumFileHandlesInitialiser maxNumFileHandlesInitialiser;
#endif
//==============================================================================
const juce_wchar File::separator = '/';
const StringRef File::separatorString ("/");
#ifndef JUCE_GCC
const juce_wchar File::separator = '/';
const StringRef File::separatorString ("/");
#endif
juce_wchar File::getSeparatorChar() { return '/'; }
StringRef File::getSeparatorString() { return "/"; }

6
modules/juce_core/native/juce_win32_Files.cpp
View file

@ -128,8 +128,10 @@ namespace WindowsFileHelpers
}
//==============================================================================
const juce_wchar File::separator = '\\';
const StringRef File::separatorString ("\\");
#ifndef JUCE_GCC
const juce_wchar File::separator = '\\';
const StringRef File::separatorString ("\\");
#endif
juce_wchar File::getSeparatorChar() { return '\\'; }
StringRef File::getSeparatorString() { return "\\"; }