mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-06 06:50:07 +00:00
Merge pull request #609 from aisamanra/master
Small fixes needed to build on clang/gcc
This commit is contained in:
commit
a67c7bb1b2
@ -10,6 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "base/signal.h"
|
||||
#include <string>
|
||||
|
||||
namespace app {
|
||||
|
||||
|
@ -29,8 +29,8 @@ public:
|
||||
std::size_t size() const { return m_items.size(); }
|
||||
std::size_t limit() const { return m_limit; }
|
||||
|
||||
template<typename T, typename Predicate>
|
||||
void addItem(const T& item, Predicate p) {
|
||||
template<typename T2, typename Predicate>
|
||||
void addItem(const T2& item, Predicate p) {
|
||||
iterator it = std::find_if(m_items.begin(), m_items.end(), p);
|
||||
|
||||
// If the item already exist in the list...
|
||||
@ -50,8 +50,8 @@ public:
|
||||
m_items.insert(m_items.begin(), item);
|
||||
}
|
||||
|
||||
template<typename T, typename Predicate>
|
||||
void removeItem(const T& item, Predicate p) {
|
||||
template<typename T2, typename Predicate>
|
||||
void removeItem(const T2& item, Predicate p) {
|
||||
iterator it = std::find_if(m_items.begin(), m_items.end(), p);
|
||||
if (it != m_items.end())
|
||||
m_items.erase(it);
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include "doc/object_id.h"
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
namespace doc {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user