Cleaned up some compiler warnings issued by Xcode 7

open-ephys · Sep 30, 2015 · b1aa82b · b1aa82b
1 parent 3b6a8a1
commit b1aa82b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 5 deletions.
diff --git a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
@@ -2901,6 +2901,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
+				OTHER_CPLUSPLUSFLAGS = "-Wno-inconsistent-missing-override";
 				OTHER_LDFLAGS = "-lhdf5 -lhdf5_cpp -lzmq";
 				SDKROOT_ppc = macosx10.5; }; name = Debug; };
 		7A6F9B742B69F66DC3E29FA8 = {isa = XCBuildConfiguration; buildSettings = {
@@ -2925,6 +2926,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
+				OTHER_CPLUSPLUSFLAGS = "-Wno-inconsistent-missing-override";
 				OTHER_LDFLAGS = "-lhdf5 -lhdf5_cpp -lzmq";
 				SDKROOT_ppc = macosx10.5; }; name = Release; };
 		C8018C9A4DA633CA60663294 = {isa = XCBuildConfiguration; buildSettings = {

diff --git a/JuceLibraryCode/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/JuceLibraryCode/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
@@ -29,6 +29,9 @@
 #endif
 
 //==============================================================================
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wnonnull"
 struct SystemVol
 {
     SystemVol (AudioObjectPropertySelector selector)
@@ -123,6 +126,7 @@ struct SystemVol
                  && isSettable;
     }
 };
+#pragma GCC diagnostic pop
 
 #define JUCE_SYSTEMAUDIOVOL_IMPLEMENTED 1
 float JUCE_CALLTYPE SystemAudioVolume::getGain()              { return SystemVol (kAudioHardwareServiceDeviceProperty_VirtualMasterVolume).getGain(); }

diff --git a/JuceLibraryCode/modules/juce_core/native/juce_mac_Files.mm b/JuceLibraryCode/modules/juce_core/native/juce_mac_Files.mm
@@ -311,12 +311,15 @@ static bool launchExecutable (const String& pathAndArguments)
     {
         NSString* p = juceStringToNS (getFullPathName());
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         return [[NSWorkspace sharedWorkspace]
                     performFileOperation: NSWorkspaceRecycleOperation
                                   source: [p stringByDeletingLastPathComponent]
                              destination: nsEmptyString()
                                    files: [NSArray arrayWithObject: [p lastPathComponent]]
                                      tag: nil ];
+#pragma GCC diagnostic pop
     }
    #endif
 }

diff --git a/JuceLibraryCode/modules/juce_core/native/juce_mac_Network.mm b/JuceLibraryCode/modules/juce_core/native/juce_mac_Network.mm
@@ -243,8 +243,11 @@ void finishedLoading()
 
     void run() override
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         connection = [[NSURLConnection alloc] initWithRequest: request
                                                      delegate: delegate];
+#pragma GCC diagnostic pop
         while (! threadShouldExit())
         {
             JUCE_AUTORELEASEPOOL

diff --git a/JuceLibraryCode/modules/juce_graphics/native/juce_mac_Fonts.mm b/JuceLibraryCode/modules/juce_graphics/native/juce_mac_Fonts.mm
@@ -272,16 +272,22 @@ static CFAttributedStringRef createCFAttributedString (const AttributedString& t
         }
 
         // Paragraph Attributes
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         CTTextAlignment ctTextAlignment = kCTLeftTextAlignment;
+#pragma GCC diagnostic pop
         CTLineBreakMode ctLineBreakMode = kCTLineBreakByWordWrapping;
         const CGFloat ctLineSpacing = text.getLineSpacing();
 
         switch (text.getJustification().getOnlyHorizontalFlags())
         {
             case Justification::left:                   break;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             case Justification::right:                  ctTextAlignment = kCTRightTextAlignment; break;
             case Justification::horizontallyCentred:    ctTextAlignment = kCTCenterTextAlignment; break;
             case Justification::horizontallyJustified:  ctTextAlignment = kCTJustifiedTextAlignment; break;
+#pragma GCC diagnostic pop
             default:                                    jassertfalse; break; // Illegal justification flags
         }
 

diff --git a/JuceLibraryCode/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm b/JuceLibraryCode/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm
@@ -160,9 +160,9 @@ - (BOOL) webView: (UIWebView*) webView shouldStartLoadWithRequest: (NSURLRequest
         static DownloadClickDetectorClass cls;
         clickListener = [cls.createInstance() init];
         DownloadClickDetectorClass::setOwner (clickListener, owner);
-        [webView setPolicyDelegate: clickListener];
-        [webView setFrameLoadDelegate: clickListener];
-        [webView setUIDelegate: clickListener];
+        [webView setPolicyDelegate: (id <WebPolicyDelegate>)clickListener];
+        [webView setFrameLoadDelegate: (id <WebFrameLoadDelegate>)clickListener];
+        [webView setUIDelegate: (id <WebUIDelegate>)clickListener];
        #else
         webView = [[UIWebView alloc] initWithFrame: CGRectMake (0, 0, 1.0f, 1.0f)];
         setView (webView);

diff --git a/Source/Processors/DataThreads/RHD2000Thread.cpp b/Source/Processors/DataThreads/RHD2000Thread.cpp
@@ -1485,7 +1485,7 @@ bool RHD2000Thread::stopAcquisition()
 
 bool RHD2000Thread::updateBuffer()
 {
-	int chOffset;
+	//int chOffset;
 	unsigned char* bufferPtr;
     //cout << "Number of 16-bit words in FIFO: " << evalBoard->numWordsInFifo() << endl;
     //cout << "Block size: " << blockSize << endl;

diff --git a/open-ephys.jucer b/open-ephys.jucer
@@ -13,7 +13,7 @@
   <EXPORTFORMATS>
     <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
                extraLinkerFlags="-lhdf5 -lhdf5_cpp -lzmq" objCExtraSuffix="fea2mT"
-               extraDefs="ZEROMQ">
+               extraDefs="ZEROMQ" extraCompilerFlags="-Wno-inconsistent-missing-override">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
                        osxSDK="default" osxCompatibility="default" osxArchitecture="default"