Sync with 5.4.0

[deliverable/titan.core.git] / compiler2 / ProjectGenHelper.cc

diff --git a/compiler2/ProjectGenHelper.cc b/compiler2/ProjectGenHelper.cc
index 991449e58504ab8592d13707ca41957f521fc872..4b475352ace20a83d1063e7f247cefb440bf7438 100644 (file)
--- a/compiler2/ProjectGenHelper.cc
+++ b/compiler2/ProjectGenHelper.cc
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////\r
-// Copyright (c) 2000-2014 Ericsson Telecom AB\r
+// Copyright (c) 2000-2015 Ericsson Telecom AB\r
 // All rights reserved. This program and the accompanying materials\r
 // are made available under the terms of the Eclipse Public License v1.0\r
 // which accompanies this distribution, and is available at\r
@@ -226,7 +226,7 @@ std::string ProjectDescriptor::setRelativePathTo(const std::string& absPathTo)
   }\r
   if (length == i) {  // got subdirectory\r
     if (projectAbsWorkingDir == absPathTo) {\r
-      return std::string("."); // the same pathes were given \r
+      return std::string("."); // the same paths were given \r
     }\r
     else if ((projectAbsWorkingDir.size() > absPathTo.size() && projectAbsWorkingDir.at(length) == SEPARATOR) ||\r
        (projectAbsWorkingDir.size() < absPathTo.size() && absPathTo.at(length) == SEPARATOR))\r
@@ -495,22 +495,22 @@ void ProjectGenHelper::getExternalLibs(std::vector<const char*>& extLibs)
   }\r
 }\r
 \r
-void ProjectGenHelper::getExternalLibSearchPathes(std::vector<const char*>& extLibPathes)\r
+void ProjectGenHelper::getExternalLibSearchPaths(std::vector<const char*>& extLibPaths)\r
 {\r
   if (!Zflag) return;\r
-  std::map<const char*, const char*, CompareStr> libPathes;\r
+  std::map<const char*, const char*, CompareStr> libPaths;\r
   for (std::map<std::string, ProjectDescriptor>::iterator it = projs.begin(); it != projs.end(); ++it) {\r
     if ((it->second).numOfLibSearchPaths() > 0) {\r
       for (size_t i = 0; i < (it->second).numOfLibSearchPaths(); ++i) {\r
         const char* key = (it->second).getLibSearchPath(i);\r
         const char* value = (it->second).getProjectName().c_str();\r
-        libPathes.insert(std::pair<const char*,const char*>(key,value)); // filter duplicates\r
+        libPaths.insert(std::pair<const char*,const char*>(key,value)); // filter duplicates\r
       }\r
     }\r
   }\r
   std::map<const char*, const char*>::iterator it;\r
-  for (it = libPathes.begin(); it != libPathes.end(); ++it) {\r
-    extLibPathes.push_back(it->first);\r
+  for (it = libPaths.begin(); it != libPaths.end(); ++it) {\r
+    extLibPaths.push_back(it->first);\r
   }\r
 }\r
 \r