From 6c488a934bde37ffcc1b60fa291340d0bf15efc7 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 13 10月 2019 20:02:13 +0800
Subject: [PATCH] test Linux
---
test/library/LicenseLocator_test.cpp | 10 +++++-----
src/library/base/base.h | 6 ------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/library/base/base.h b/src/library/base/base.h
index 6ad0bc6..898688f 100644
--- a/src/library/base/base.h
+++ b/src/library/base/base.h
@@ -1,7 +1,6 @@
#ifndef BASE_H_
#define BASE_H_
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -29,11 +28,6 @@
#endif
/* #define _DEBUG */
-
-#define cmax(a,b) \
- ({ __typeof__ (a) _a = (a); \
- __typeof__ (b) _b = (b); \
- _a > _b ? _a : _b; })
#define cmin(a,b) \
({ __typeof__ (a) _a = (a); \
diff --git a/test/library/LicenseLocator_test.cpp b/test/library/LicenseLocator_test.cpp
index ce966fe..eb4bda0 100644
--- a/test/library/LicenseLocator_test.cpp
+++ b/test/library/LicenseLocator_test.cpp
@@ -50,15 +50,15 @@
exeFileFound = exeLocation.has_value();
if (exeFileFound) {
referenceExeFileName = exeLocation.get().string();
- referenceLicenseFileName = referenceExeFileName.replace(referenceExeFileName.find(BOOST_TEST_MODULE ".exe"),
+ referenceLicenseFileName = referenceExeFileName.replace(referenceExeFileName.find(BOOST_TEST_MODULE ".exe"),
string(BOOST_TEST_MODULE ".exe").size(), BOOST_TEST_MODULE ".lic");
}
#else
- const string referenceExeFileName = testExeFolder + "/" + BOOST_TEST_MODULE;
- ifstream f(referenceExeFileName.c_str());
+ referenceExeFileName = testExeFolder + "/" + BOOST_TEST_MODULE;
+ std::ifstream f(referenceExeFileName.c_str());
exeFileFound = f.good();
referenceLicenseFileName = testExeFolder + "/" + BOOST_TEST_MODULE ".lic";
-#endif
+#endif
BOOST_WARN_MESSAGE(!exeFileFound, "File [" + referenceExeFileName + "] NOT found");
if (exeFileFound) {
//copy test license near module
@@ -168,7 +168,7 @@
#else
unsetenv(LICENSE_LOCATION_ENV_VAR);
#endif
-
+
}
/**
--
Gitblit v1.9.1