Cleanup: Fix warnings about comparing int and size_t
Pull Request: https://projects.blender.org/blender/cycles/pulls/24
This commit is contained in:
committed by
Brecht Van Lommel
parent
26ccbaf8b5
commit
178b0cbff9
@@ -154,12 +154,12 @@ class ProfilingWithShaderHelper : public ProfilingHelper {
|
||||
state->object = object;
|
||||
|
||||
if (shader >= 0) {
|
||||
assert(shader < state->shader_hits.size());
|
||||
assert(shader < int(state->shader_hits.size()));
|
||||
state->shader_hits[shader]++;
|
||||
}
|
||||
|
||||
if (object >= 0) {
|
||||
assert(object < state->object_hits.size());
|
||||
assert(object < int(state->object_hits.size()));
|
||||
state->object_hits[object]++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ template<typename T> class unique_ptr_vector {
|
||||
|
||||
void erase(const T *value)
|
||||
{
|
||||
const int size = data.size();
|
||||
const size_t size = data.size();
|
||||
for (size_t i = 0; i < size; i++) {
|
||||
if (data[i].get() == value) {
|
||||
data.erase(data.begin() + i);
|
||||
@@ -76,7 +76,7 @@ template<typename T> class unique_ptr_vector {
|
||||
* but will change element order. */
|
||||
void erase_by_swap(const T *value)
|
||||
{
|
||||
const int size = data.size();
|
||||
const size_t size = data.size();
|
||||
for (size_t i = 0; i < size; i++) {
|
||||
if (data[i].get() == value) {
|
||||
swap(data[i], data[data.size() - 1]);
|
||||
|
||||
Reference in New Issue
Block a user