From 36ce07093b68b07513149577c209ae7a57ab356b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 16:26:21 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' into develop issues #2 #3 #14 #49
---
src/library/locate/EnvironmentVarLocation.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/library/locate/EnvironmentVarLocation.cpp b/src/library/locate/EnvironmentVarLocation.cpp
index 5615482..e74228a 100644
--- a/src/library/locate/EnvironmentVarLocation.cpp
+++ b/src/library/locate/EnvironmentVarLocation.cpp
@@ -7,9 +7,9 @@
#include <licensecc_properties.h>
-#include "../base/FileUtils.hpp"
#include "../base/StringUtils.h"
#include "EnvironmentVarLocation.hpp"
+#include "../base/file_utils.hpp"
namespace license {
namespace locate {
@@ -22,14 +22,14 @@
const vector<string> EnvironmentVarLocation::license_locations(EventRegistry &eventRegistry) {
vector<string> licenseFileFoundWithEnvVariable;
- const string varName(LICENSE_LOCATION_ENV_VAR);
+ const string varName(LCC_LICENSE_LOCATION_ENV_VAR);
if (varName.length() > 0) {
// var name is defined in header files.
- char *env_var_value = getenv(LICENSE_LOCATION_ENV_VAR);
+ char *env_var_value = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
if (env_var_value != nullptr && env_var_value[0] != '\0') {
const vector<string> declared_positions = license::split_string(string(env_var_value), ';');
licenseFileFoundWithEnvVariable =
- license::filter_existing_files(declared_positions, eventRegistry, LICENSE_LOCATION_ENV_VAR);
+ license::filter_existing_files(declared_positions, eventRegistry, LCC_LICENSE_LOCATION_ENV_VAR);
} else {
eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED);
}
--
Gitblit v1.9.1