MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cast size_t to int explicitly to avoid compiler warning C4267

develop
Japa 2016-10-15 10:31:38 +05:30
parent 98ab357df0
commit 08cc9f3188
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/DataDefs.h
Unescape Escape View File

@ -398,7 +398,7 @@ int linear_index(const DFHack::enum_list_attr<T> &lst, T val) {
inline int linear_index(const DFHack::enum_list_attr<const char*> &lst, const std::string &val) {
for (size_t i = 0; i < lst.size; i++)
if (lst.items[i] == val)
return i;
return (int)i;
return -1;
}

10
library/include/DataIdentity.h
Unescape Escape View File

@ -319,7 +319,7 @@ namespace df
protected:
virtual int item_count(void *ptr, CountMode) {
return ((container*)ptr)->size();
return (int)((container*)ptr)->size();
};
virtual void *item_pointer(type_identity *, void *ptr, int idx) {
return &(*(container*)ptr)[idx];
@ -385,7 +385,7 @@ namespace df
}
protected:
virtual int item_count(void *ptr, CountMode) { return ((T*)ptr)->size(); }
virtual int item_count(void *ptr, CountMode) { return (int)((T*)ptr)->size(); }
virtual void *item_pointer(type_identity *item, void *ptr, int idx) {
return &(*(T*)ptr)[idx];
}
@ -410,7 +410,7 @@ namespace df
virtual bool insert(void *ptr, int idx, void *item) { return false; }
protected:
virtual int item_count(void *ptr, CountMode) { return ((T*)ptr)->size(); }
virtual int item_count(void *ptr, CountMode) { return (int)((T*)ptr)->size(); }
virtual void *item_pointer(type_identity *item, void *ptr, int idx) {
auto iter = (*(T*)ptr).begin();
for (; idx > 0; idx--) ++iter;
@ -472,7 +472,7 @@ namespace df
protected:
virtual int item_count(void *ptr, CountMode) {
return ((container*)ptr)->size();
return (int)((container*)ptr)->size();
}
virtual bool get_item(void *ptr, int idx) {
return (*(container*)ptr)[idx];
@ -498,7 +498,7 @@ namespace df
protected:
virtual int item_count(void *ptr, CountMode cm) {
return cm == COUNT_WRITE ? 0 : ((container*)ptr)->size;
return cm == COUNT_WRITE ? 0 : (int)((container*)ptr)->size;
}
virtual void *item_pointer(type_identity *item, void *ptr, int idx) {
return (void*)&((container*)ptr)->items[idx];