Browse Source

Fix a few more warnings, cleanup

tags/1.9.8
falkTX 7 years ago
parent
commit
eeaff46212
4 changed files with 8 additions and 18 deletions
  1. +3
    -0
      source/libjack/libjack.cpp
  2. +4
    -2
      source/modules/water/files/juce_File.cpp
  3. +0
    -15
      source/modules/water/threads/juce_Process.h
  4. +1
    -1
      source/modules/water/xml/juce_XmlElement.cpp

+ 3
- 0
source/libjack/libjack.cpp View File

@@ -987,6 +987,9 @@ void CarlaJackAppClient::runRealtimeThread()
fNonRealtimeThread.signalThreadShouldExit(); fNonRealtimeThread.signalThreadShouldExit();


carla_debug("CarlaJackAppClient runRealtimeThread FINISHED"); carla_debug("CarlaJackAppClient runRealtimeThread FINISHED");

// TODO
return; (void)quitReceived;
} }


void CarlaJackAppClient::runNonRealtimeThread() void CarlaJackAppClient::runNonRealtimeThread()


+ 4
- 2
source/modules/water/files/juce_File.cpp View File

@@ -211,7 +211,7 @@ String File::addTrailingSeparator (const String& path)
} }
//============================================================================== //==============================================================================
#if JUCE_LINUX
#if ! (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
#define NAMES_ARE_CASE_SENSITIVE 1 #define NAMES_ARE_CASE_SENSITIVE 1
#endif #endif
@@ -371,8 +371,10 @@ bool File::isAChildOf (const File& potentialParent) const
return getParentDirectory().isAChildOf (potentialParent); return getParentDirectory().isAChildOf (potentialParent);
} }
#if 0
int File::hashCode() const { return fullPath.hashCode(); } int File::hashCode() const { return fullPath.hashCode(); }
int64 File::hashCode64() const { return fullPath.hashCode64(); } int64 File::hashCode64() const { return fullPath.hashCode64(); }
#endif
//============================================================================== //==============================================================================
bool File::isAbsolutePath (StringRef path) bool File::isAbsolutePath (StringRef path)
@@ -927,7 +929,7 @@ bool File::createSymbolicLink (const File& linkFileToCreate, bool overwriteExist
linkFileToCreate.deleteFile(); linkFileToCreate.deleteFile();
} }
#if JUCE_MAC || JUCE_LINUX
#ifndef CARLA_OS_WIN
// one common reason for getting an error here is that the file already exists // one common reason for getting an error here is that the file already exists
if (symlink (fullPath.toRawUTF8(), linkFileToCreate.getFullPathName().toRawUTF8()) == -1) if (symlink (fullPath.toRawUTF8(), linkFileToCreate.getFullPathName().toRawUTF8()) == -1)
{ {


+ 0
- 15
source/modules/water/threads/juce_Process.h View File

@@ -140,21 +140,6 @@ public:
static void JUCE_CALLTYPE setCurrentModuleInstanceHandle (void* newHandle) noexcept; static void JUCE_CALLTYPE setCurrentModuleInstanceHandle (void* newHandle) noexcept;
#endif #endif
#if JUCE_MAC || DOXYGEN
//==============================================================================
/** OSX ONLY - Shows or hides the OSX dock icon for this app. */
static void setDockIconVisible (bool isVisible);
#endif
#if JUCE_MAC || JUCE_LINUX || DOXYGEN
//==============================================================================
/** UNIX ONLY - Attempts to use setrlimit to change the maximum number of file
handles that the app can open. Pass 0 or less as the parameter to mean
'infinite'. Returns true if it succeeds.
*/
static bool setMaxNumberOfFileHandles (int maxNumberOfFiles) noexcept;
#endif
private: private:
Process(); Process();
JUCE_DECLARE_NON_COPYABLE (Process) JUCE_DECLARE_NON_COPYABLE (Process)


+ 1
- 1
source/modules/water/xml/juce_XmlElement.cpp View File

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


Loading…
Cancel
Save