dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-03-30 20:45:58 +00:00
parent ba34ec7ade 0cf25e84df
commit 58433c7667
108 changed files with 353 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fios.h
View File

@@ -130,7 +130,7 @@ public:
* Get the number of files in the list.
* @return The number of files stored in the list.
*/
inline uint Length() const
inline size_t Length() const
{
return this->files.size();
}
@@ -157,7 +157,7 @@ public:
* Get a pointer to the indicated file information. File information must exist.
* @return Address of the indicated existing file information.
*/
inline const FiosItem *Get(uint index) const
inline const FiosItem *Get(size_t index) const
{
return this->files.data() + index;
}
@@ -166,12 +166,12 @@ public:
* Get a pointer to the indicated file information. File information must exist.
* @return Address of the indicated existing file information.
*/
inline FiosItem *Get(uint index)
inline FiosItem *Get(size_t index)
{
return this->files.data() + index;
}
inline const FiosItem &operator[](uint index) const
inline const FiosItem &operator[](size_t index) const
{
return this->files[index];
}
@@ -180,7 +180,7 @@ public:
* Get a reference to the indicated file information. File information must exist.
* @return The requested file information.
*/
inline FiosItem &operator[](uint index)
inline FiosItem &operator[](size_t index)
{
return this->files[index];
}