fixes need for llvm 5.0: use fully qualified clangcms::support

cms-sw · Sep 15, 2017 · a7a1eea · a7a1eea
1 parent 9f20abe
commit a7a1eea
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Utilities/StaticAnalyzers/src/CmsSupport.cpp b/Utilities/StaticAnalyzers/src/CmsSupport.cpp
@@ -24,10 +24,9 @@
 #define ERROR_RATE .0002
 
 
-using namespace clangcms;
 using namespace clang;
 using namespace llvm;
-bool support::isCmsLocalFile(const char* file)
+bool clangcms::support::isCmsLocalFile(const char* file)
 {
   static const char* LocalDir= std::getenv("LOCALRT");
   [[cms::thread_safe]] static int DirLen=-1;
@@ -44,7 +43,7 @@ bool support::isCmsLocalFile(const char* file)
 // This is a wrapper around NamedDecl::getQualifiedNameAsString.
 // It produces more qualified output to distinguish several cases
 // which would otherwise be ambiguous.
-std::string support::getQualifiedName(const clang::NamedDecl &d) {
+std::string clangcms::support::getQualifiedName(const clang::NamedDecl &d) {
   std::string ret;
   const DeclContext *ctx = d.getDeclContext();
   if (ctx->isFunctionOrMethod() && isa<NamedDecl>(ctx))
@@ -109,7 +108,7 @@ std::string support::getQualifiedName(const clang::NamedDecl &d) {
 }
 
 
-bool support::isSafeClassName(const std::string &cname) {
+bool clangcms::support::isSafeClassName(const std::string &cname) {
 
   static const std::vector<std::string> names = {
     "atomic<",
@@ -147,7 +146,7 @@ bool support::isSafeClassName(const std::string &cname) {
   return false;
 }
 
-bool support::isDataClass(const std::string & name) {
+bool clangcms::support::isDataClass(const std::string & name) {
      [[cms::thread_safe]] static std::string iname("");
      if ( iname == "") {
           clang::FileSystemOptions FSO;
@@ -180,13 +179,13 @@ bool support::isDataClass(const std::string & name) {
      return false;
 }
 
-bool support::isInterestingLocation(const std::string & fname) {
+bool clangcms::support::isInterestingLocation(const std::string & fname) {
      if ( fname[0] == '<' && fname.find(".h")==std::string::npos ) return false;
      if ( fname.find("/test/") != std::string::npos ) return false;
      return true;
 }
 
-bool support::isKnownThrUnsafeFunc(const std::string &fname ) {
+bool clangcms::support::isKnownThrUnsafeFunc(const std::string &fname ) {
      static const std::vector<std::string> names = {
           "TGraph::Fit(const char *,", 
           "TGraph2D::Fit(const char *,", 
@@ -202,7 +201,7 @@ bool support::isKnownThrUnsafeFunc(const std::string &fname ) {
      return false;
 }
 
-void support::writeLog(const std::string &ostring,const std::string &tfstring) {
+void clangcms::support::writeLog(const std::string &ostring,const std::string &tfstring) {
      const char * pPath = std::getenv("LOCALRT");
      if ( pPath == NULL ) {
           llvm::errs()<<"\n\nThe scram runtime envorinment is not set.\nRun 'cmsenv' or 'eval `scram runtime -csh`'.\n\n\n";
@@ -220,7 +219,7 @@ void support::writeLog(const std::string &ostring,const std::string &tfstring) {
      return;
 }
 
-void support::fixAnonNS(std::string & name, const char * fname ){
+void clangcms::support::fixAnonNS(std::string & name, const char * fname ){
      const std::string anon_ns = "(anonymous namespace)";
      if (name.substr(0, anon_ns.size()) == anon_ns ) {
           const char* sname = "/src/";