From a98888ebb70da2ad058ec07c1919dfa2ef9f2e68 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 19 10月 2019 16:31:58 +0800 Subject: [PATCH] fix windows --- src/library/base/EventRegistry.h | 2 +- test/library/LicenseLocator_test.cpp | 4 ++-- test/functional/volid_test.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/library/base/EventRegistry.h b/src/library/base/EventRegistry.h index f5fec62..af5389b 100644 --- a/src/library/base/EventRegistry.h +++ b/src/library/base/EventRegistry.h @@ -31,7 +31,7 @@ * For every license keep track of the events who progressed most * in the validation process */ - std::map<std::string,int> mostAdvancedLogIdx_by_LicenseId; + std::map<std::string,size_t> mostAdvancedLogIdx_by_LicenseId; int current_validation_step; public: diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp index 3ab5348..dedb040 100644 --- a/test/functional/volid_test.cpp +++ b/test/functional/volid_test.cpp @@ -79,7 +79,7 @@ strategies.push_back(ETHERNET); } - int num_strategies = strategies.size(); + size_t num_strategies = strategies.size(); if(num_strategies == 0) { //see issue #49 can't use default return; diff --git a/test/library/LicenseLocator_test.cpp b/test/library/LicenseLocator_test.cpp index c622a93..b1f7eaf 100644 --- a/test/library/LicenseLocator_test.cpp +++ b/test/library/LicenseLocator_test.cpp @@ -100,7 +100,7 @@ std::string referenceContent((std::istreambuf_iterator<char>(src)), std::istreambuf_iterator<char>()); license::EventRegistry registry; - const LicenseLocation licLocation({applicationDefinedString,nullptr}); + const LicenseLocation licLocation={applicationDefinedString,nullptr}; ExternalDefinition externalDefinition(&licLocation); vector<string> licenseInfos = externalDefinition.license_locations(registry); BOOST_CHECK(registry.isGood()); @@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE( external_definition_not_found ) { const char *applicationDefinedString = PROJECT_TEST_SRC_DIR "/this/file/doesnt/exist"; license::EventRegistry registry; - const LicenseLocation licLocation({applicationDefinedString,nullptr}); + const LicenseLocation licLocation = { applicationDefinedString,nullptr }; ExternalDefinition externalDefinition(&licLocation); vector<string> licenseInfos = externalDefinition.license_locations(registry); -- Gitblit v1.9.1