Skip to content

Commit f918eb9

Browse files
authored
Merge pull request #299 from yagui/warnings
Warnings fixs
2 parents c9ec53d + 20f8f9d commit f918eb9

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ class DrawableButton;
174174
#include "mouse/juce_DragAndDropContainer.h"
175175
#include "mouse/juce_FileDragAndDropTarget.h"
176176
#include "mouse/juce_SelectedItemSet.h"
177-
#include "mouse/juce_LassoComponent.h"
178177
#include "mouse/juce_MouseInactivityDetector.h"
179178
#include "mouse/juce_TextDragAndDropTarget.h"
180179
#include "mouse/juce_TooltipClient.h"
@@ -280,6 +279,7 @@ class DrawableButton;
280279
#include "lookandfeel/juce_LookAndFeel_V2.h"
281280
#include "lookandfeel/juce_LookAndFeel_V1.h"
282281
#include "lookandfeel/juce_LookAndFeel_V3.h"
282+
#include "mouse/juce_LassoComponent.h"
283283

284284
}
285285

Plugins/EvntTrigAvg/EvntTrigAvg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ uint64 EvntTrigAvg::binDataPoint(uint64 startBin, uint64 endBin, uint64 binSize,
400400
return binDataPoint(startBin+(binsToSearch),endBin,binSize,dataPoint);
401401
}
402402
else{
403-
return NULL;
403+
return (uint64) NULL;
404404
}
405405
}
406406

@@ -442,7 +442,7 @@ float EvntTrigAvg::findMin(uint64* data_)
442442
{
443443
const ScopedLock myScopedLock(mut);
444444
//uint64 min = UINT64_MAX;
445-
uint64 min = 18446744073709551614;
445+
uint64 min = 18446744073709551614U;
446446
for (int i = 0 ; i < windowSize/binSize ; i++){
447447
if(data_[i]<min){
448448
min=data_[i];

Plugins/IntanRecordingController/rhythm-api/okFrontPanelDLL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ class FrontPanelManager
10871087
okCFrontPanelManager_HANDLE h;
10881088
};
10891089

1090-
typedef std::auto_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
1090+
typedef std::unique_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
10911091

10921092
/// \brief Allows to easily open devices in any realms.
10931093
class FrontPanelDevices

Plugins/RhythmNode/rhythm-api/okFrontPanelDLL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ class FrontPanelManager
10871087
okCFrontPanelManager_HANDLE h;
10881088
};
10891089

1090-
typedef std::auto_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
1090+
typedef std::unique_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
10911091

10921092
/// \brief Allows to easily open devices in any realms.
10931093
class FrontPanelDevices

Source/Processors/RecordNode/EngineConfigWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void EngineConfigComponent::buttonClicked(Button* b)
206206
if (response == 1)
207207
AccessClass::getProcessorGraph()->getRecordNode()->setParameter(3, 0.0);
208208
else
209-
b->setToggleState(true, false);
209+
b->setToggleState(true, juce::NotificationType::dontSendNotification);
210210

211211

212212
}

0 commit comments

Comments
 (0)