From 3eeb130c21f94770cec666220f867b7f91b13763 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周一, 10 2月 2020 05:07:32 +0800 Subject: [PATCH] fix ubuntu 16.10 --- test/functional/standard-license_test.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp index 6d55de8..5d3839c 100644 --- a/test/functional/standard-license_test.cpp +++ b/test/functional/standard-license_test.cpp @@ -11,11 +11,11 @@ #include "generate-license.h" #include "../../src/library/base/FileUtils.hpp" +using namespace std; +namespace fs = boost::filesystem; + namespace license { namespace test { -namespace fs = boost::filesystem; -using namespace license; -using namespace std; /** * Test a generic license with no expiry neither client id. The license is read from file @@ -27,7 +27,7 @@ LicenseInfo license; LicenseLocation location = {LICENSE_PATH}; std::copy(licLocation.begin(), licLocation.end(), location.licenseData); - const EVENT_TYPE result = acquire_license(nullptr, &location, &license); + const LCC_EVENT_TYPE result = acquire_license(nullptr, &location, &license); BOOST_CHECK_EQUAL(result, LICENSE_OK); BOOST_CHECK_EQUAL(license.has_expiry, false); BOOST_CHECK_EQUAL(license.linked_to_pc, false); @@ -45,7 +45,7 @@ LicenseInfo license; LicenseLocation location = {LICENSE_PLAIN_DATA}; std::copy(license_data.begin(), license_data.end(), location.licenseData); - const EVENT_TYPE result = acquire_license(nullptr, &location, &license); + const LCC_EVENT_TYPE result = acquire_license(nullptr, &location, &license); BOOST_CHECK_EQUAL(result, LICENSE_OK); BOOST_CHECK_EQUAL(license.has_expiry, false); BOOST_CHECK_EQUAL(license.linked_to_pc, false); -- Gitblit v1.9.1