Merge branch 'master' into jgrpp
# Conflicts: # src/industry_cmd.cpp # src/landscape.cpp # src/object_cmd.cpp # src/rail_cmd.cpp # src/script/api/script_tile.cpp # src/table/settings/difficulty_settings.ini # src/table/settings/world_settings.ini # src/terraform_cmd.cpp # src/tilearea_type.h # src/tree_cmd.cpp # src/tree_cmd.h # src/tree_gui.cpp # src/water_cmd.cpp
This commit is contained in:
@@ -446,9 +446,9 @@ int MacOSStringCompare(const char *s1, const char *s2)
|
||||
return this->utf16_to_utf8[this->cur_pos];
|
||||
}
|
||||
|
||||
/* static */ StringIterator *OSXStringIterator::Create()
|
||||
/* static */ std::unique_ptr<StringIterator> OSXStringIterator::Create()
|
||||
{
|
||||
if (!MacOSVersionIsAtLeast(10, 5, 0)) return nullptr;
|
||||
|
||||
return new OSXStringIterator();
|
||||
return std::make_unique<OSXStringIterator>();
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@ public:
|
||||
size_t Next(IterType what) override;
|
||||
size_t Prev(IterType what) override;
|
||||
|
||||
static StringIterator *Create();
|
||||
static std::unique_ptr<StringIterator> Create();
|
||||
};
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user