From 87ef087f7ae2729388bfb7f4adb05974ead449e0 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 30 11月 2019 14:56:28 +0800
Subject: [PATCH] merge commits

---
 test/functional/generate-license.cpp |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/functional/generate-license.cpp b/test/functional/generate-license.cpp
index b41ff66..febf621 100644
--- a/test/functional/generate-license.cpp
+++ b/test/functional/generate-license.cpp
@@ -28,8 +28,9 @@
 		BOOST_REQUIRE_MESSAGE(fs::create_directories(licenses_base), "test folders created " + licenses_base.string());
 	}
 
-	fs::path license_fname(licenses_base / (license_name + ".lic"));
-	remove(license_fname.c_str());
+	const fs::path license_fname(licenses_base / (license_name + ".lic"));
+	const string license_fname_s = license_fname.string();
+	remove(license_fname_s.c_str());
 
 	stringstream ss;
 	ss << LCC_EXE << " license issue";
@@ -60,15 +61,15 @@
 		BOOST_REQUIRE_MESSAGE(fs::create_directories(licenses_base), "test folders created " + licenses_base.string());
 	}
 
-	fs::path outputFile(fs::path(PROJECT_TEST_TEMP_DIR) / (test_name + ".tmp"));
-
-	remove(outputFile.c_str());
+	const fs::path outputFile(fs::path(PROJECT_TEST_TEMP_DIR) / (test_name + ".tmp"));
+	const string output_file_s = outputFile.string();
+	remove(output_file_s.c_str());
 
 	stringstream ss;
 	ss << LCC_EXE << " test sign";
 	ss << " --" PARAM_PRIMARY_KEY " " << LCC_PROJECT_PRIVATE_KEY;
 	ss << " -d " << data;
-	ss << " -o " << outputFile.string();
+	ss << " -o " << output_file_s;
 
 	cout << "executing :" << ss.str() << endl;
 	const int retCode = std::system(ss.str().c_str());

--
Gitblit v1.9.1