diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ecbcae4eb7552db9958cf28f553d7f1a9cb7d358..207f13ad266fb3e491aab31340be090ac1c9e8d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,24 +27,24 @@ win_visual_studio_static_local_deps: # Windows 10 with dependencies # downloaded (and compiled) locally # compiled by VisualStudio 2015 -#win_visual_studio_2015_static_local_deps: -# tags: -# - Win -# -# image: windows:latest -# -# stage: build -# -# before_script: -# - rmdir /s /q build external_dependencies/* -# - set DEPENDENCIES_LINK_TYPE=static -# - set clean_after=yes -# - set BUILD_LIB=yes -# - set BUILD_EXAMPLES=yes -# - set BUILD_TESTS=yes -# -# script: -# - call build_scripts\windows\win_VS2015_build_x64_release.bat +win_visual_studio_2015_static_local_deps: + tags: + - Win + + image: windows:latest + + stage: build + + before_script: + - rmdir /s /q build external_dependencies/* + - set DEPENDENCIES_LINK_TYPE=static + - set clean_after=yes + - set BUILD_LIB=yes + - set BUILD_EXAMPLES=yes + - set BUILD_TESTS=yes + + script: + - call build_scripts\windows\win_VS2015_build_x64_release.bat # Latest Ubuntu with dependencies # in system directories, Boost diff --git a/src/Reader/XYZReader.h b/src/Reader/XYZReader.h index b6eab8862f955844164e2feea3e79ca5042c87df..c077418448e2dea8a7d4605f655474e68e0212e4 100644 --- a/src/Reader/XYZReader.h +++ b/src/Reader/XYZReader.h @@ -9,6 +9,7 @@ #include <vector> #include <memory> #include <algorithm> +#include <unordered_map> #include "../settings.h" #include "../DataSet/DataSet.h"