Commit d8949fa2 authored by David Thompson's avatar David Thompson Committed by Kitware Robot
Browse files

Merge topic 'fix-more-warnings'

dc68951b Eliminate warning.
abf67c7c Use `_snprintf_s` instead of `_snprintf` on Windows.
61ac8eea Use the new qtmain policy.
parents f32d5f50 dc68951b
cmake_minimum_required (VERSION 2.8.10)
cmake_policy(SET CMP0020 NEW)
project(SMTK)
#Add our Cmake directory to the module search path
......
......@@ -164,7 +164,7 @@ int Entity::findOrAppendRelation(const smtk::util::UUID& r)
{
if (this->m_relations[i] == r)
{
return i;
return static_cast<int>(i);
}
}
int idx = static_cast<int>(this->m_relations.size());
......
......@@ -10,7 +10,7 @@
#include <string.h>
#if defined(_WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf
# define snprintf(buf, cnt, fmt, ...) _snprintf_s(buf, cnt, cnt, fmt, __VA_ARGS__)
#endif
using namespace smtk::util;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment