Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Mathäus Mendel
2016-03-09 17:24:47 -03:00
2 changed files with 5 additions and 4 deletions

View File

@@ -86,7 +86,7 @@ public:
TaskList taskList() const;
/// Returns a copy of the internal task list.
int count() const;
std::size_t count() const;
/// Returns the number of tasks in the internal task list.
void addObserver(const AbstractObserver& observer);
@@ -125,11 +125,11 @@ private:
//
// inlines
//
inline int TaskManager::count() const
inline std::size_t TaskManager::count() const
{
FastMutex::ScopedLock lock(_mutex);
return (int) _taskList.size();
return _taskList.size();
}