Skip to content

Commit

Permalink
- fixed warnings on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Hart committed Sep 30, 2024
1 parent c74fc71 commit 127aa59
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion currentGitHash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
71af017983d5821bddf3898cc6215ce55ac88de3
c74fc713e4260b74c04f3f193c5fb032075ce143
2 changes: 1 addition & 1 deletion hi_backend/backend/currentGit.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define PREVIOUS_HISE_COMMIT "71af017983d5821bddf3898cc6215ce55ac88de3"
#define PREVIOUS_HISE_COMMIT "c74fc713e4260b74c04f3f193c5fb032075ce143"
2 changes: 2 additions & 0 deletions hi_core/hi_sampler/sampler/components/SampleEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,8 @@ SampleEditor::SampleEditor (ModulatorSampler *s, SamplerBody *b):
auto xc = AudioDisplayComponent::SampleArea::getAreaColour(AudioDisplayComponent::AreaTypes::LoopCrossfadeArea);
auto sc = AudioDisplayComponent::SampleArea::getAreaColour(AudioDisplayComponent::AreaTypes::SampleStartArea);

ignoreUnused(sc);

#if HISE_SAMPLER_ALLOW_RELEASE_START
auto rc = AudioDisplayComponent::SampleArea::getReleaseStartColour();
#else
Expand Down
4 changes: 0 additions & 4 deletions hi_scripting/scripting/api/ScriptComponentWrappers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3297,11 +3297,7 @@ void ScriptCreatedComponentWrappers::ViewportWrapper::ColumnListBoxModel::paintL
if(auto laf = dynamic_cast<simple_css::StyleSheetLookAndFeel*>(&c->getLookAndFeel()))
{
auto lb = dynamic_cast<ListBox*>(c);

auto rc = lb->getComponentForRowNumber(rowNumber);

auto pos = lb->getMouseXYRelative();

auto rowIsHovered = currentHoverRow == rowNumber;

if(laf->drawListBoxRow(rowNumber, g, text, rc, width, height, rowIsSelected, rowIsHovered))
Expand Down
2 changes: 1 addition & 1 deletion hi_tools/hi_multipage/State.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ void HardcodedDialogWithState::resized()
{
if(dialog == nullptr)
{
if(dialog = createDialog(state))
if((dialog = createDialog(state)))
{
addAndMakeVisible(dialog);

Expand Down
2 changes: 1 addition & 1 deletion hi_tools/mcl_editor/code_editor/Autocomplete.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ struct CodeSnippetProvider::CodeSnippetToken: public mcl::TokenCollection::Token
{
if(*ptr == '$')
{
indexes.add((ptr - start) - indexes.size());
indexes.add(static_cast<int>((ptr - start)) - indexes.size());
}
else
{
Expand Down
1 change: 0 additions & 1 deletion hi_tools/simple_css/StyleSheet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,6 @@ std::vector<melatonin::ShadowParameters> StyleSheet::getShadow(Rectangle<float>
{
auto full = v.getRawValueString();
auto ptr = full.begin();
auto token = ptr;
auto end = full.end();

char buffer[128];
Expand Down

0 comments on commit 127aa59

Please sign in to comment.