Skip to content

Commit b1aa82b

Browse files
committed
Cleaned up some compiler warnings issued by Xcode 7
1 parent 3b6a8a1 commit b1aa82b

8 files changed

Lines changed: 23 additions & 5 deletions

File tree

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,6 +2901,7 @@
29012901
INSTALL_PATH = "$(HOME)/Applications";
29022902
LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
29032903
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
2904+
OTHER_CPLUSPLUSFLAGS = "-Wno-inconsistent-missing-override";
29042905
OTHER_LDFLAGS = "-lhdf5 -lhdf5_cpp -lzmq";
29052906
SDKROOT_ppc = macosx10.5; }; name = Debug; };
29062907
7A6F9B742B69F66DC3E29FA8 = {isa = XCBuildConfiguration; buildSettings = {
@@ -2925,6 +2926,7 @@
29252926
INSTALL_PATH = "$(HOME)/Applications";
29262927
LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
29272928
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
2929+
OTHER_CPLUSPLUSFLAGS = "-Wno-inconsistent-missing-override";
29282930
OTHER_LDFLAGS = "-lhdf5 -lhdf5_cpp -lzmq";
29292931
SDKROOT_ppc = macosx10.5; }; name = Release; };
29302932
C8018C9A4DA633CA60663294 = {isa = XCBuildConfiguration; buildSettings = {

JuceLibraryCode/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
#endif
3030

3131
//==============================================================================
32+
#pragma GCC diagnostic push
33+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
34+
#pragma GCC diagnostic ignored "-Wnonnull"
3235
struct SystemVol
3336
{
3437
SystemVol (AudioObjectPropertySelector selector)
@@ -123,6 +126,7 @@ struct SystemVol
123126
&& isSettable;
124127
}
125128
};
129+
#pragma GCC diagnostic pop
126130

127131
#define JUCE_SYSTEMAUDIOVOL_IMPLEMENTED 1
128132
float JUCE_CALLTYPE SystemAudioVolume::getGain() { return SystemVol (kAudioHardwareServiceDeviceProperty_VirtualMasterVolume).getGain(); }

JuceLibraryCode/modules/juce_core/native/juce_mac_Files.mm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,15 @@ static bool launchExecutable (const String& pathAndArguments)
311311
{
312312
NSString* p = juceStringToNS (getFullPathName());
313313

314+
#pragma GCC diagnostic push
315+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
314316
return [[NSWorkspace sharedWorkspace]
315317
performFileOperation: NSWorkspaceRecycleOperation
316318
source: [p stringByDeletingLastPathComponent]
317319
destination: nsEmptyString()
318320
files: [NSArray arrayWithObject: [p lastPathComponent]]
319321
tag: nil ];
322+
#pragma GCC diagnostic pop
320323
}
321324
#endif
322325
}

JuceLibraryCode/modules/juce_core/native/juce_mac_Network.mm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,11 @@ void finishedLoading()
243243

244244
void run() override
245245
{
246+
#pragma GCC diagnostic push
247+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
246248
connection = [[NSURLConnection alloc] initWithRequest: request
247249
delegate: delegate];
250+
#pragma GCC diagnostic pop
248251
while (! threadShouldExit())
249252
{
250253
JUCE_AUTORELEASEPOOL

JuceLibraryCode/modules/juce_graphics/native/juce_mac_Fonts.mm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,16 +272,22 @@ static CFAttributedStringRef createCFAttributedString (const AttributedString& t
272272
}
273273

274274
// Paragraph Attributes
275+
#pragma GCC diagnostic push
276+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
275277
CTTextAlignment ctTextAlignment = kCTLeftTextAlignment;
278+
#pragma GCC diagnostic pop
276279
CTLineBreakMode ctLineBreakMode = kCTLineBreakByWordWrapping;
277280
const CGFloat ctLineSpacing = text.getLineSpacing();
278281

279282
switch (text.getJustification().getOnlyHorizontalFlags())
280283
{
281284
case Justification::left: break;
285+
#pragma GCC diagnostic push
286+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
282287
case Justification::right: ctTextAlignment = kCTRightTextAlignment; break;
283288
case Justification::horizontallyCentred: ctTextAlignment = kCTCenterTextAlignment; break;
284289
case Justification::horizontallyJustified: ctTextAlignment = kCTJustifiedTextAlignment; break;
290+
#pragma GCC diagnostic pop
285291
default: jassertfalse; break; // Illegal justification flags
286292
}
287293

JuceLibraryCode/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ - (BOOL) webView: (UIWebView*) webView shouldStartLoadWithRequest: (NSURLRequest
160160
static DownloadClickDetectorClass cls;
161161
clickListener = [cls.createInstance() init];
162162
DownloadClickDetectorClass::setOwner (clickListener, owner);
163-
[webView setPolicyDelegate: clickListener];
164-
[webView setFrameLoadDelegate: clickListener];
165-
[webView setUIDelegate: clickListener];
163+
[webView setPolicyDelegate: (id <WebPolicyDelegate>)clickListener];
164+
[webView setFrameLoadDelegate: (id <WebFrameLoadDelegate>)clickListener];
165+
[webView setUIDelegate: (id <WebUIDelegate>)clickListener];
166166
#else
167167
webView = [[UIWebView alloc] initWithFrame: CGRectMake (0, 0, 1.0f, 1.0f)];
168168
setView (webView);

Source/Processors/DataThreads/RHD2000Thread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ bool RHD2000Thread::stopAcquisition()
14851485

14861486
bool RHD2000Thread::updateBuffer()
14871487
{
1488-
int chOffset;
1488+
//int chOffset;
14891489
unsigned char* bufferPtr;
14901490
//cout << "Number of 16-bit words in FIFO: " << evalBoard->numWordsInFifo() << endl;
14911491
//cout << "Block size: " << blockSize << endl;

open-ephys.jucer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<EXPORTFORMATS>
1414
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
1515
extraLinkerFlags="-lhdf5 -lhdf5_cpp -lzmq" objCExtraSuffix="fea2mT"
16-
extraDefs="ZEROMQ">
16+
extraDefs="ZEROMQ" extraCompilerFlags="-Wno-inconsistent-missing-override">
1717
<CONFIGURATIONS>
1818
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
1919
osxSDK="default" osxCompatibility="default" osxArchitecture="default"

0 commit comments

Comments
 (0)