diff options
| author | bunnei <bunneidev@gmail.com> | 2015-04-17 20:22:03 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-04-17 20:22:03 -0400 |
| commit | 5e55a525d879b14853f7a1cd71601d2c4076670e (patch) | |
| tree | 74b50de3c4b3fcd218cc4e96b9d4d336aa0c15c6 | |
| parent | 1add98d7f8fd6ee9d7ff246276a7708a04693a35 (diff) | |
| parent | f15c142c5e31422b5b9ec8de23f43d8091958fbd (diff) | |
Merge pull request #691 from rohit-n/sign-compare
Silence some -Wsign-compare warnings.
| -rw-r--r-- | src/citra_qt/debugger/profiler.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index ae0568b6a..2ac1748b7 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp @@ -26,7 +26,7 @@ static QVariant GetDataForColumn(int col, const AggregatedDuration& duration) static const TimingCategoryInfo* GetCategoryInfo(int id) { const auto& categories = GetProfilingManager().GetTimingCategoriesInfo(); - if (id >= categories.size()) { + if ((size_t)id >= categories.size()) { return nullptr; } else { return &categories[id]; @@ -98,7 +98,7 @@ QVariant ProfilerModel::data(const QModelIndex& index, int role) const const TimingCategoryInfo* info = GetCategoryInfo(index.row() - 2); return info != nullptr ? QString(info->name) : QVariant(); } else { - if (index.row() - 2 < results.time_per_category.size()) { + if (index.row() - 2 < (int)results.time_per_category.size()) { return GetDataForColumn(index.column(), results.time_per_category[index.row() - 2]); } else { return QVariant(); diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index dd46f0ec3..6ec253601 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp @@ -342,10 +342,10 @@ static void ProcessTriangleInternal(const VertexShader::OutputVertex& v0, case Regs::TextureConfig::MirroredRepeat: { - int coord = (int)((unsigned)val % (2 * size)); + unsigned int coord = ((unsigned)val % (2 * size)); if (coord >= size) coord = 2 * size - 1 - coord; - return coord; + return (int)coord; } default: |