From 69d6f2e7fe9912ca880e0ab3e0d028bf95965d5c Mon Sep 17 00:00:00 2001 From: mpv Date: Thu, 5 May 2016 09:50:28 +0300 Subject: [PATCH] Minor changes --- CMakeCommon/UnitTest.cmake | 1 - src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeCommon/UnitTest.cmake b/CMakeCommon/UnitTest.cmake index 1a69191c0..010d52f7c 100644 --- a/CMakeCommon/UnitTest.cmake +++ b/CMakeCommon/UnitTest.cmake @@ -38,7 +38,6 @@ MACRO(ADD_UNIT_TESTS) SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PYTHON_API}:$ENV{PYTHONPATH}") endif() - SET(_CONFIG_FILE "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_XML_RESOURCES}") foreach(eachFileName ${ARGN}) # Strip the ".py" suffix GET_FILENAME_COMPONENT(aTestName ${eachFileName} NAME_WE) diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.cpp index 3e9b00b75..91c4d3381 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.cpp +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.cpp @@ -470,7 +470,7 @@ void PlaneGCSSolver_Storage::toggleEntity( } theTo.push_back(*anIt); - int aShift = anIt - theFrom.begin(); + int aShift = int(anIt - theFrom.begin()); theFrom.erase(anIt); anIt = theFrom.begin() + aShift; } -- 2.39.2