[cfe-commits] r122423 - in /cfe/trunk: include/clang/Analysis/DomainSpecific/ include/clang/GR/ include/clang/GR/BugReporter/ include/clang/GR/Checkers/ include/clang/GR/PathSensitive/ lib/Analysis/ lib/FrontendTool/ lib/GR/ lib/GR/Checkers/

Argyrios Kyrtzidis akyrtzi at gmail.com
Wed Dec 22 10:53:21 PST 2010


Author: akirtzidis
Date: Wed Dec 22 12:53:20 2010
New Revision: 122423

URL: http://llvm.org/viewvc/llvm-project?rev=122423&view=rev
Log:
[analyzer] Refactoring: Move stuff into namespace 'GR'.

Modified:
    cfe/trunk/include/clang/Analysis/DomainSpecific/CocoaConventions.h
    cfe/trunk/include/clang/GR/AnalysisConsumer.h
    cfe/trunk/include/clang/GR/BugReporter/BugReporter.h
    cfe/trunk/include/clang/GR/BugReporter/BugType.h
    cfe/trunk/include/clang/GR/BugReporter/PathDiagnostic.h
    cfe/trunk/include/clang/GR/Checkers/DereferenceChecker.h
    cfe/trunk/include/clang/GR/Checkers/LocalCheckers.h
    cfe/trunk/include/clang/GR/FrontendActions.h
    cfe/trunk/include/clang/GR/ManagerRegistry.h
    cfe/trunk/include/clang/GR/PathDiagnosticClients.h
    cfe/trunk/include/clang/GR/PathSensitive/AnalysisManager.h
    cfe/trunk/include/clang/GR/PathSensitive/BasicValueFactory.h
    cfe/trunk/include/clang/GR/PathSensitive/Checker.h
    cfe/trunk/include/clang/GR/PathSensitive/CheckerHelpers.h
    cfe/trunk/include/clang/GR/PathSensitive/CheckerVisitor.h
    cfe/trunk/include/clang/GR/PathSensitive/ConstraintManager.h
    cfe/trunk/include/clang/GR/PathSensitive/Environment.h
    cfe/trunk/include/clang/GR/PathSensitive/ExplodedGraph.h
    cfe/trunk/include/clang/GR/PathSensitive/GRBlockCounter.h
    cfe/trunk/include/clang/GR/PathSensitive/GRCoreEngine.h
    cfe/trunk/include/clang/GR/PathSensitive/GRExprEngine.h
    cfe/trunk/include/clang/GR/PathSensitive/GRExprEngineBuilders.h
    cfe/trunk/include/clang/GR/PathSensitive/GRState.h
    cfe/trunk/include/clang/GR/PathSensitive/GRStateTrait.h
    cfe/trunk/include/clang/GR/PathSensitive/GRSubEngine.h
    cfe/trunk/include/clang/GR/PathSensitive/GRTransferFuncs.h
    cfe/trunk/include/clang/GR/PathSensitive/GRWorkList.h
    cfe/trunk/include/clang/GR/PathSensitive/MemRegion.h
    cfe/trunk/include/clang/GR/PathSensitive/SValBuilder.h
    cfe/trunk/include/clang/GR/PathSensitive/SVals.h
    cfe/trunk/include/clang/GR/PathSensitive/Store.h
    cfe/trunk/include/clang/GR/PathSensitive/SummaryManager.h
    cfe/trunk/include/clang/GR/PathSensitive/SymbolManager.h
    cfe/trunk/lib/Analysis/CocoaConventions.cpp
    cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp
    cfe/trunk/lib/GR/AggExprVisitor.cpp
    cfe/trunk/lib/GR/AnalysisConsumer.cpp
    cfe/trunk/lib/GR/AnalysisManager.cpp
    cfe/trunk/lib/GR/AnalyzerStatsChecker.cpp
    cfe/trunk/lib/GR/BasicConstraintManager.cpp
    cfe/trunk/lib/GR/BasicStore.cpp
    cfe/trunk/lib/GR/BasicValueFactory.cpp
    cfe/trunk/lib/GR/BugReporter.cpp
    cfe/trunk/lib/GR/BugReporterVisitors.cpp
    cfe/trunk/lib/GR/CFRefCount.cpp
    cfe/trunk/lib/GR/Checker.cpp
    cfe/trunk/lib/GR/CheckerHelpers.cpp
    cfe/trunk/lib/GR/Checkers/AdjustedReturnValueChecker.cpp
    cfe/trunk/lib/GR/Checkers/ArrayBoundChecker.cpp
    cfe/trunk/lib/GR/Checkers/AttrNonNullChecker.cpp
    cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.cpp
    cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.h
    cfe/trunk/lib/GR/Checkers/BuiltinFunctionChecker.cpp
    cfe/trunk/lib/GR/Checkers/CStringChecker.cpp
    cfe/trunk/lib/GR/Checkers/CallAndMessageChecker.cpp
    cfe/trunk/lib/GR/Checkers/CastSizeChecker.cpp
    cfe/trunk/lib/GR/Checkers/CastToStructChecker.cpp
    cfe/trunk/lib/GR/Checkers/CheckDeadStores.cpp
    cfe/trunk/lib/GR/Checkers/CheckObjCDealloc.cpp
    cfe/trunk/lib/GR/Checkers/CheckObjCInstMethSignature.cpp
    cfe/trunk/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp
    cfe/trunk/lib/GR/Checkers/CheckSizeofPointer.cpp
    cfe/trunk/lib/GR/Checkers/ChrootChecker.cpp
    cfe/trunk/lib/GR/Checkers/DereferenceChecker.cpp
    cfe/trunk/lib/GR/Checkers/DivZeroChecker.cpp
    cfe/trunk/lib/GR/Checkers/FixedAddressChecker.cpp
    cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.cpp
    cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.h
    cfe/trunk/lib/GR/Checkers/GRExprEngineInternalChecks.h
    cfe/trunk/lib/GR/Checkers/IdempotentOperationChecker.cpp
    cfe/trunk/lib/GR/Checkers/LLVMConventionsChecker.cpp
    cfe/trunk/lib/GR/Checkers/MacOSXAPIChecker.cpp
    cfe/trunk/lib/GR/Checkers/MallocChecker.cpp
    cfe/trunk/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp
    cfe/trunk/lib/GR/Checkers/NSErrorChecker.cpp
    cfe/trunk/lib/GR/Checkers/NoReturnFunctionChecker.cpp
    cfe/trunk/lib/GR/Checkers/OSAtomicChecker.cpp
    cfe/trunk/lib/GR/Checkers/ObjCAtSyncChecker.cpp
    cfe/trunk/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp
    cfe/trunk/lib/GR/Checkers/PointerArithChecker.cpp
    cfe/trunk/lib/GR/Checkers/PointerSubChecker.cpp
    cfe/trunk/lib/GR/Checkers/PthreadLockChecker.cpp
    cfe/trunk/lib/GR/Checkers/ReturnPointerRangeChecker.cpp
    cfe/trunk/lib/GR/Checkers/ReturnUndefChecker.cpp
    cfe/trunk/lib/GR/Checkers/StackAddrLeakChecker.cpp
    cfe/trunk/lib/GR/Checkers/StreamChecker.cpp
    cfe/trunk/lib/GR/Checkers/UndefBranchChecker.cpp
    cfe/trunk/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp
    cfe/trunk/lib/GR/Checkers/UndefResultChecker.cpp
    cfe/trunk/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp
    cfe/trunk/lib/GR/Checkers/UndefinedAssignmentChecker.cpp
    cfe/trunk/lib/GR/Checkers/UnixAPIChecker.cpp
    cfe/trunk/lib/GR/Checkers/UnreachableCodeChecker.cpp
    cfe/trunk/lib/GR/Checkers/VLASizeChecker.cpp
    cfe/trunk/lib/GR/Environment.cpp
    cfe/trunk/lib/GR/ExplodedGraph.cpp
    cfe/trunk/lib/GR/FlatStore.cpp
    cfe/trunk/lib/GR/FrontendActions.cpp
    cfe/trunk/lib/GR/GRBlockCounter.cpp
    cfe/trunk/lib/GR/GRCXXExprEngine.cpp
    cfe/trunk/lib/GR/GRCoreEngine.cpp
    cfe/trunk/lib/GR/GRExprEngine.cpp
    cfe/trunk/lib/GR/GRState.cpp
    cfe/trunk/lib/GR/HTMLDiagnostics.cpp
    cfe/trunk/lib/GR/ManagerRegistry.cpp
    cfe/trunk/lib/GR/MemRegion.cpp
    cfe/trunk/lib/GR/PathDiagnostic.cpp
    cfe/trunk/lib/GR/PlistDiagnostics.cpp
    cfe/trunk/lib/GR/RangeConstraintManager.cpp
    cfe/trunk/lib/GR/RegionStore.cpp
    cfe/trunk/lib/GR/SValBuilder.cpp
    cfe/trunk/lib/GR/SVals.cpp
    cfe/trunk/lib/GR/SimpleConstraintManager.cpp
    cfe/trunk/lib/GR/SimpleConstraintManager.h
    cfe/trunk/lib/GR/SimpleSValBuilder.cpp
    cfe/trunk/lib/GR/Store.cpp
    cfe/trunk/lib/GR/SymbolManager.cpp
    cfe/trunk/lib/GR/TextPathDiagnostics.cpp

Modified: cfe/trunk/include/clang/Analysis/DomainSpecific/CocoaConventions.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/DomainSpecific/CocoaConventions.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/DomainSpecific/CocoaConventions.h (original)
+++ cfe/trunk/include/clang/Analysis/DomainSpecific/CocoaConventions.h Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/AST/Type.h"
 
 namespace clang {
+namespace GR {
 namespace cocoa {
  
   enum NamingConvention { NoConvention, CreateRule, InitRule };
@@ -34,6 +35,6 @@
   
   bool isCocoaObjectRef(QualType T);
 
-}}
+}}}
 
 #endif

Modified: cfe/trunk/include/clang/GR/AnalysisConsumer.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/AnalysisConsumer.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/AnalysisConsumer.h (original)
+++ cfe/trunk/include/clang/GR/AnalysisConsumer.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CHECKER_ANALYSISCONSUMER_H
-#define LLVM_CLANG_CHECKER_ANALYSISCONSUMER_H
+#ifndef LLVM_CLANG_GR_ANALYSISCONSUMER_H
+#define LLVM_CLANG_GR_ANALYSISCONSUMER_H
 
 #include <string>
 
@@ -23,6 +23,8 @@
 class ASTConsumer;
 class Preprocessor;
 
+namespace GR {
+
 /// CreateAnalysisConsumer - Creates an ASTConsumer to run various code
 /// analysis passes.  (The set of analyses run is controlled by command-line
 /// options.)
@@ -30,6 +32,8 @@
                                     const std::string &output,
                                     const AnalyzerOptions& Opts);
 
-}
+} // end GR namespace
+
+} // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/BugReporter/BugReporter.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/BugReporter/BugReporter.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/BugReporter/BugReporter.h (original)
+++ cfe/trunk/include/clang/GR/BugReporter/BugReporter.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_BUGREPORTER
-#define LLVM_CLANG_ANALYSIS_BUGREPORTER
+#ifndef LLVM_CLANG_GR_BUGREPORTER
+#define LLVM_CLANG_GR_BUGREPORTER
 
 #include "clang/Basic/SourceLocation.h"
 #include "clang/GR/PathSensitive/GRState.h"
@@ -25,20 +25,23 @@
 
 namespace clang {
 
+class ASTContext;
+class Diagnostic;
+class Stmt;
+class ParentMap;
+
+namespace GR {
+
 class PathDiagnostic;
 class PathDiagnosticPiece;
 class PathDiagnosticClient;
-class ASTContext;
-class Diagnostic;
 class ExplodedNode;
 class ExplodedGraph;
 class BugReporter;
 class BugReporterContext;
 class GRExprEngine;
 class GRState;
-class Stmt;
 class BugType;
-class ParentMap;
 
 //===----------------------------------------------------------------------===//
 // Interface for individual bug reports.
@@ -476,6 +479,8 @@
 
 //===----------------------------------------------------------------------===//
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/BugReporter/BugType.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/BugReporter/BugType.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/BugReporter/BugType.h (original)
+++ cfe/trunk/include/clang/GR/BugReporter/BugType.h Wed Dec 22 12:53:20 2010
@@ -20,6 +20,8 @@
 
 namespace clang {
 
+namespace GR {
+
 class ExplodedNode;
 class GRExprEngine;
 
@@ -68,5 +70,7 @@
   llvm::StringRef getDescription() const { return desc; }
 };
 
+} // end GR namespace
+
 } // end clang namespace
 #endif

Modified: cfe/trunk/include/clang/GR/BugReporter/PathDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/BugReporter/PathDiagnostic.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/BugReporter/PathDiagnostic.h (original)
+++ cfe/trunk/include/clang/GR/BugReporter/PathDiagnostic.h Wed Dec 22 12:53:20 2010
@@ -27,6 +27,8 @@
 class SourceManager;
 class Stmt;
 
+namespace GR {
+
 //===----------------------------------------------------------------------===//
 // High-level interface for handlers of path-sensitive diagnostics.
 //===----------------------------------------------------------------------===//
@@ -490,5 +492,9 @@
   
   void Profile(llvm::FoldingSetNodeID &ID) const;
 };  
+
+} // end GR namespace
+
 } //end clang namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/Checkers/DereferenceChecker.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/Checkers/DereferenceChecker.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/Checkers/DereferenceChecker.h (original)
+++ cfe/trunk/include/clang/GR/Checkers/DereferenceChecker.h Wed Dec 22 12:53:20 2010
@@ -13,19 +13,23 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_DEREFCHECKER
-#define LLVM_CLANG_DEREFCHECKER
+#ifndef LLVM_CLANG_GR_DEREFCHECKER
+#define LLVM_CLANG_GR_DEREFCHECKER
 
 #include <utility>
 
 namespace clang {
 
+namespace GR {
+
 class GRExprEngine;
 class ExplodedNode;
 
 std::pair<ExplodedNode * const *, ExplodedNode * const *>
 GetImplicitNullDereferences(GRExprEngine &Eng);
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/Checkers/LocalCheckers.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/Checkers/LocalCheckers.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/Checkers/LocalCheckers.h (original)
+++ cfe/trunk/include/clang/GR/Checkers/LocalCheckers.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_LOCALCHECKERS_H
-#define LLVM_CLANG_ANALYSIS_LOCALCHECKERS_H
+#ifndef LLVM_CLANG_GR_LOCALCHECKERS_H
+#define LLVM_CLANG_GR_LOCALCHECKERS_H
 
 namespace clang {
 
@@ -21,18 +21,21 @@
 class Decl;
 class Diagnostic;
 class ASTContext;
-class PathDiagnosticClient;
-class GRTransferFuncs;
-class BugType;
 class LangOptions;
 class ParentMap;
 class LiveVariables;
-class BugReporter;
 class ObjCImplementationDecl;
 class LangOptions;
-class GRExprEngine;
 class TranslationUnitDecl;
 
+namespace GR {
+
+class PathDiagnosticClient;
+class GRTransferFuncs;
+class BugType;
+class BugReporter;
+class GRExprEngine;
+
 void CheckDeadStores(CFG &cfg, LiveVariables &L, ParentMap &map, 
                      BugReporter& BR);
 
@@ -56,6 +59,9 @@
 void CheckSizeofPointer(const Decl *D, BugReporter &BR);
 
 void RegisterCallInliner(GRExprEngine &Eng);
+
+} // end GR namespace
+
 } // end namespace clang
 
 #endif

Modified: cfe/trunk/include/clang/GR/FrontendActions.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/FrontendActions.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/FrontendActions.h (original)
+++ cfe/trunk/include/clang/GR/FrontendActions.h Wed Dec 22 12:53:20 2010
@@ -7,13 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CHECKER_FRONTENDACTIONS_H
-#define LLVM_CLANG_CHECKER_FRONTENDACTIONS_H
+#ifndef LLVM_CLANG_GR_FRONTENDACTIONS_H
+#define LLVM_CLANG_GR_FRONTENDACTIONS_H
 
 #include "clang/Frontend/FrontendAction.h"
 
 namespace clang {
 
+namespace GR {
+
 //===----------------------------------------------------------------------===//
 // AST Consumer Actions
 //===----------------------------------------------------------------------===//
@@ -24,6 +26,8 @@
                                          llvm::StringRef InFile);
 };
 
-}  // end namespace clang
+} // end GR namespace
+
+} // end namespace clang
 
 #endif

Modified: cfe/trunk/include/clang/GR/ManagerRegistry.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/ManagerRegistry.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/ManagerRegistry.h (original)
+++ cfe/trunk/include/clang/GR/ManagerRegistry.h Wed Dec 22 12:53:20 2010
@@ -11,13 +11,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_MANAGER_REGISTRY_H
-#define LLVM_CLANG_ANALYSIS_MANAGER_REGISTRY_H
+#ifndef LLVM_CLANG_GR_MANAGER_REGISTRY_H
+#define LLVM_CLANG_GR_MANAGER_REGISTRY_H
 
 #include "clang/GR/PathSensitive/GRState.h"
 
 namespace clang {
 
+namespace GR {
+
 /// ManagerRegistry - This class records manager creators registered at
 /// runtime. The information is communicated to AnalysisManager through static
 /// members. Better design is expected.
@@ -49,5 +51,8 @@
   }
 };
 
-}
+} // end GR namespace
+
+} // end clang namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/PathDiagnosticClients.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathDiagnosticClients.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathDiagnosticClients.h (original)
+++ cfe/trunk/include/clang/GR/PathDiagnosticClients.h Wed Dec 22 12:53:20 2010
@@ -11,16 +11,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CHECKER_PATH_DIAGNOSTIC_CLIENTS_H
-#define LLVM_CLANG_CHECKER_PATH_DIAGNOSTIC_CLiENTS_H
+#ifndef LLVM_CLANG_GR_PATH_DIAGNOSTIC_CLIENTS_H
+#define LLVM_CLANG_GR_PATH_DIAGNOSTIC_CLiENTS_H
 
 #include <string>
 
 namespace clang {
 
-class PathDiagnosticClient;
 class Preprocessor;
 
+namespace GR {
+
+class PathDiagnosticClient;
+
 PathDiagnosticClient*
 createHTMLDiagnosticClient(const std::string& prefix, const Preprocessor &PP);
 
@@ -32,5 +35,8 @@
 createTextPathDiagnosticClient(const std::string& prefix,
                                const Preprocessor &PP);
 
+} // end GR namespace
+
 } // end clang namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/AnalysisManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/AnalysisManager.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/AnalysisManager.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/AnalysisManager.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_ANALYSISMANAGER_H
-#define LLVM_CLANG_ANALYSIS_ANALYSISMANAGER_H
+#ifndef LLVM_CLANG_GR_ANALYSISMANAGER_H
+#define LLVM_CLANG_GR_ANALYSISMANAGER_H
 
 #include "clang/Analysis/AnalysisContext.h"
 #include "clang/GR/BugReporter/BugReporter.h"
@@ -26,6 +26,8 @@
   class TranslationUnit; 
 }
 
+namespace GR {
+
 class AnalysisManager : public BugReporterData {
   AnalysisContextManager AnaCtxMgr;
   LocationContextManager LocCtxMgr;
@@ -199,6 +201,8 @@
   }
 };
 
-}
+} // end GR namespace
+
+} // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/BasicValueFactory.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/BasicValueFactory.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/BasicValueFactory.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/BasicValueFactory.h Wed Dec 22 12:53:20 2010
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_BASICVALUEFACTORY_H
-#define LLVM_CLANG_ANALYSIS_BASICVALUEFACTORY_H
+#ifndef LLVM_CLANG_GR_BASICVALUEFACTORY_H
+#define LLVM_CLANG_GR_BASICVALUEFACTORY_H
 
 #include "clang/GR/PathSensitive/SVals.h"
 #include "clang/AST/ASTContext.h"
@@ -24,6 +24,8 @@
 
 namespace clang {
 
+namespace GR {
+
   class GRState;
 
 class CompoundValData : public llvm::FoldingSetNode {
@@ -192,6 +194,8 @@
   const SVal* getPersistentSVal(SVal X);
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/Checker.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/Checker.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/Checker.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/Checker.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_CHECKER
-#define LLVM_CLANG_ANALYSIS_CHECKER
+#ifndef LLVM_CLANG_GR_CHECKER
+#define LLVM_CLANG_GR_CHECKER
 
 #include "clang/Analysis/Support/SaveAndRestore.h"
 #include "clang/GR/PathSensitive/GRExprEngine.h"
@@ -24,6 +24,8 @@
 
 namespace clang {
 
+namespace GR {
+
 class CheckerContext {
   ExplodedNodeSet &Dst;
   GRStmtNodeBuilder &B;
@@ -298,6 +300,9 @@
   virtual void VisitEndAnalysis(ExplodedGraph &G, BugReporter &B,
                                 GRExprEngine &Eng) {}
 };
+
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/CheckerHelpers.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/CheckerHelpers.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/CheckerHelpers.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/CheckerHelpers.h Wed Dec 22 12:53:20 2010
@@ -11,13 +11,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CHECKER_PATHSENSITIVE_CHECKERHELPERS
-#define LLVM_CLANG_CHECKER_PATHSENSITIVE_CHECKERHELPERS
+#ifndef LLVM_CLANG_GR_PATHSENSITIVE_CHECKERHELPERS
+#define LLVM_CLANG_GR_PATHSENSITIVE_CHECKERHELPERS
 
 #include "clang/AST/Stmt.h"
 
 namespace clang {
 
+namespace GR {
+
 bool containsMacro(const Stmt *S);
 bool containsEnum(const Stmt *S);
 bool containsStaticLocal(const Stmt *S);
@@ -35,6 +37,8 @@
   return false;
 }
 
-}
+} // end GR namespace
+
+} // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/CheckerVisitor.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/CheckerVisitor.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/CheckerVisitor.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/CheckerVisitor.h Wed Dec 22 12:53:20 2010
@@ -11,12 +11,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_CHECKERVISITOR
-#define LLVM_CLANG_ANALYSIS_CHECKERVISITOR
+#ifndef LLVM_CLANG_GR_CHECKERVISITOR
+#define LLVM_CLANG_GR_CHECKERVISITOR
 #include "clang/GR/PathSensitive/Checker.h"
 
 namespace clang {
 
+namespace GR {
+
 //===----------------------------------------------------------------------===//
 // Checker visitor interface.  Used by subclasses of Checker to specify their
 // own checker visitor logic.
@@ -102,6 +104,8 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.def"
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/ConstraintManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/ConstraintManager.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/ConstraintManager.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/ConstraintManager.h Wed Dec 22 12:53:20 2010
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_CONSTRAINT_MANAGER_H
-#define LLVM_CLANG_ANALYSIS_CONSTRAINT_MANAGER_H
+#ifndef LLVM_CLANG_GR_CONSTRAINT_MANAGER_H
+#define LLVM_CLANG_GR_CONSTRAINT_MANAGER_H
 
 // FIXME: Typedef LiveSymbolsTy/DeadSymbolsTy at a more appropriate place.
 #include "clang/GR/PathSensitive/Store.h"
@@ -23,6 +23,8 @@
 
 namespace clang {
 
+namespace GR {
+
 class GRState;
 class GRStateManager;
 class GRSubEngine;
@@ -67,6 +69,8 @@
 ConstraintManager* CreateRangeConstraintManager(GRStateManager& statemgr,
                                                 GRSubEngine &subengine);
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/Environment.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/Environment.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/Environment.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/Environment.h Wed Dec 22 12:53:20 2010
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_ENVIRONMENT_H
-#define LLVM_CLANG_ANALYSIS_ENVIRONMENT_H
+#ifndef LLVM_CLANG_GR_ENVIRONMENT_H
+#define LLVM_CLANG_GR_ENVIRONMENT_H
 
 #include "clang/GR/PathSensitive/Store.h"
 #include "clang/GR/PathSensitive/SVals.h"
@@ -20,9 +20,12 @@
 
 namespace clang {
 
+class LiveVariables;
+
+namespace GR {
+
 class EnvironmentManager;
 class SValBuilder;
-class LiveVariables;
 
 /// Environment - An immutable map from Stmts to their current
 ///  symbolic values (SVals).
@@ -96,6 +99,8 @@
                           llvm::SmallVectorImpl<const MemRegion*>& RegionRoots);
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/ExplodedGraph.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/ExplodedGraph.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/ExplodedGraph.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/ExplodedGraph.h Wed Dec 22 12:53:20 2010
@@ -16,8 +16,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_EXPLODEDGRAPH
-#define LLVM_CLANG_ANALYSIS_EXPLODEDGRAPH
+#ifndef LLVM_CLANG_GR_EXPLODEDGRAPH
+#define LLVM_CLANG_GR_EXPLODEDGRAPH
 
 #include "clang/Analysis/ProgramPoint.h"
 #include "clang/Analysis/AnalysisContext.h"
@@ -34,8 +34,11 @@
 
 namespace clang {
 
-class GRState;
 class CFG;
+
+namespace GR {
+
+class GRState;
 class ExplodedGraph;
 
 //===----------------------------------------------------------------------===//
@@ -368,13 +371,15 @@
   inline const_iterator end()   const { return Impl.end();   }
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 // GraphTraits
 
 namespace llvm {
-  template<> struct GraphTraits<clang::ExplodedNode*> {
-    typedef clang::ExplodedNode NodeType;
+  template<> struct GraphTraits<clang::GR::ExplodedNode*> {
+    typedef clang::GR::ExplodedNode NodeType;
     typedef NodeType::succ_iterator  ChildIteratorType;
     typedef llvm::df_iterator<NodeType*>      nodes_iterator;
 
@@ -399,8 +404,8 @@
     }
   };
 
-  template<> struct GraphTraits<const clang::ExplodedNode*> {
-    typedef const clang::ExplodedNode NodeType;
+  template<> struct GraphTraits<const clang::GR::ExplodedNode*> {
+    typedef const clang::GR::ExplodedNode NodeType;
     typedef NodeType::const_succ_iterator   ChildIteratorType;
     typedef llvm::df_iterator<NodeType*>       nodes_iterator;
 

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRBlockCounter.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRBlockCounter.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRBlockCounter.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRBlockCounter.h Wed Dec 22 12:53:20 2010
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_GRBLOCKCOUNTER
-#define LLVM_CLANG_ANALYSIS_GRBLOCKCOUNTER
+#ifndef LLVM_CLANG_GR_GRBLOCKCOUNTER
+#define LLVM_CLANG_GR_GRBLOCKCOUNTER
 
 namespace llvm {
   class BumpPtrAllocator;
@@ -24,6 +24,8 @@
 
 class StackFrameContext;
 
+namespace GR {
+
 class GRBlockCounter {
   void* Data;
 
@@ -50,6 +52,8 @@
   friend class Factory;
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRCoreEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRCoreEngine.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRCoreEngine.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRCoreEngine.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_GRENGINE
-#define LLVM_CLANG_ANALYSIS_GRENGINE
+#ifndef LLVM_CLANG_GR_GRENGINE
+#define LLVM_CLANG_GR_GRENGINE
 
 #include "clang/AST/Expr.h"
 #include "clang/GR/PathSensitive/ExplodedGraph.h"
@@ -24,6 +24,8 @@
 
 namespace clang {
 
+namespace GR {
+
 //===----------------------------------------------------------------------===//
 /// GRCoreEngine - Implements the core logic of the graph-reachability
 ///   analysis. It traverses the CFG and generates the ExplodedGraph.
@@ -532,6 +534,9 @@
 
   void generateNode(const GRState *state);
 }; 
+
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRExprEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRExprEngine.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRExprEngine.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRExprEngine.h Wed Dec 22 12:53:20 2010
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_GREXPRENGINE
-#define LLVM_CLANG_ANALYSIS_GREXPRENGINE
+#ifndef LLVM_CLANG_GR_GREXPRENGINE
+#define LLVM_CLANG_GR_GREXPRENGINE
 
 #include "clang/GR/PathSensitive/AnalysisManager.h"
 #include "clang/GR/PathSensitive/GRSubEngine.h"
@@ -28,9 +28,13 @@
 #include "clang/AST/StmtObjC.h"
 
 namespace clang {
+
+class ObjCForCollectionStmt;
+
+namespace GR {
+
 class AnalysisManager;
 class Checker;
-class ObjCForCollectionStmt;
 
 class GRExprEngine : public GRSubEngine {
   AnalysisManager &AMgr;
@@ -533,6 +537,8 @@
   bool InlineCall(ExplodedNodeSet &Dst, const CallExpr *CE, ExplodedNode *Pred);
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRExprEngineBuilders.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRExprEngineBuilders.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRExprEngineBuilders.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRExprEngineBuilders.h Wed Dec 22 12:53:20 2010
@@ -12,13 +12,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_GREXPRENGINE_BUILDERS
-#define LLVM_CLANG_ANALYSIS_GREXPRENGINE_BUILDERS
+#ifndef LLVM_CLANG_GR_GREXPRENGINE_BUILDERS
+#define LLVM_CLANG_GR_GREXPRENGINE_BUILDERS
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 #include "clang/Analysis/Support/SaveAndRestore.h"
 
 namespace clang {
 
+namespace GR {
+
 class GRStmtNodeBuilderRef {
   ExplodedNodeSet &Dst;
   GRStmtNodeBuilder &B;
@@ -72,5 +74,8 @@
   }
 };
 
+} // end GR namespace
+
 } // end clang namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRState.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRState.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRState.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRState.h Wed Dec 22 12:53:20 2010
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_VALUESTATE_H
-#define LLVM_CLANG_ANALYSIS_VALUESTATE_H
+#ifndef LLVM_CLANG_GR_VALUESTATE_H
+#define LLVM_CLANG_GR_VALUESTATE_H
 
 #include "clang/GR/PathSensitive/ConstraintManager.h"
 #include "clang/GR/PathSensitive/Environment.h"
@@ -30,6 +30,9 @@
 
 namespace clang {
 class ASTContext;
+
+namespace GR {
+
 class GRStateManager;
 class Checker;
 
@@ -749,6 +752,9 @@
   scanReachableSymbols(beg, end, cb);
   return cb;
 }
+
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRStateTrait.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRStateTrait.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRStateTrait.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRStateTrait.h Wed Dec 22 12:53:20 2010
@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 
-#ifndef LLVM_CLANG_ANALYSIS_GRSTATETRAIT_H
-#define LLVM_CLANG_ANALYSIS_GRSTATETRAIT_H
+#ifndef LLVM_CLANG_GR_GRSTATETRAIT_H
+#define LLVM_CLANG_GR_GRSTATETRAIT_H
 
 namespace llvm {
   class BumpPtrAllocator;
@@ -26,6 +26,8 @@
 }
 
 namespace clang {
+
+namespace GR {
   template <typename T> struct GRStatePartialTrait;
 
   // Partial-specialization for ImmutableMap.
@@ -143,6 +145,8 @@
       delete (typename data_type::Factory*) Ctx;
     }
   };
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRSubEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRSubEngine.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRSubEngine.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRSubEngine.h Wed Dec 22 12:53:20 2010
@@ -10,16 +10,21 @@
 // This file defines the interface of a subengine of the GRCoreEngine.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_ANALYSIS_GRSUBENGINE_H
-#define LLVM_CLANG_ANALYSIS_GRSUBENGINE_H
+#ifndef LLVM_CLANG_GR_GRSUBENGINE_H
+#define LLVM_CLANG_GR_GRSUBENGINE_H
 
 #include "clang/GR/PathSensitive/SVals.h"
 
 namespace clang {
 
-class AnalysisManager;
 class CFGBlock;
 class CFGElement;
+class LocationContext;
+class Stmt;
+
+namespace GR {
+
+class AnalysisManager;
 class ExplodedNode;
 class GRState;
 class GRStateManager;
@@ -31,9 +36,7 @@
 class GREndPathNodeBuilder;
 class GRCallEnterNodeBuilder;
 class GRCallExitNodeBuilder;
-class LocationContext;
 class MemRegion;
-class Stmt;
 
 class GRSubEngine {
 public:
@@ -102,6 +105,9 @@
   //  maximum number of analysis steps have been reached.
   virtual void ProcessEndWorklist(bool hasWorkRemaining) = 0;
 };
-}
+
+} // end GR namespace
+
+} // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRTransferFuncs.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRTransferFuncs.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRTransferFuncs.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRTransferFuncs.h Wed Dec 22 12:53:20 2010
@@ -12,21 +12,23 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_GRTF
-#define LLVM_CLANG_ANALYSIS_GRTF
+#ifndef LLVM_CLANG_GR_TRANSFERFUNCS
+#define LLVM_CLANG_GR_TRANSFERFUNCS
 
 #include "clang/GR/PathSensitive/GRState.h"
 #include "clang/GR/PathSensitive/SVals.h"
 #include <vector>
 
 namespace clang {
+class ObjCMessageExpr;
+
+namespace GR {
 class ExplodedNode;
 class ExplodedNodeSet;
 class GREndPathNodeBuilder;
 class GRExprEngine;
 class GRStmtNodeBuilder;
 class GRStmtNodeBuilderRef;
-class ObjCMessageExpr;
 
 class GRTransferFuncs {
 public:
@@ -82,6 +84,9 @@
     return state;
   }  
 };
+
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/GRWorkList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/GRWorkList.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/GRWorkList.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/GRWorkList.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_GRWORKLIST
-#define LLVM_CLANG_ANALYSIS_GRWORKLIST
+#ifndef LLVM_CLANG_GR_GRWORKLIST
+#define LLVM_CLANG_GR_GRWORKLIST
 
 #include "clang/GR/PathSensitive/GRBlockCounter.h"
 #include <cstddef>
@@ -21,6 +21,9 @@
 namespace clang {
   
 class CFGBlock;
+
+namespace GR {
+
 class ExplodedNode;
 class ExplodedNodeImpl;
 
@@ -83,5 +86,9 @@
   static GRWorkList *MakeBFS();
   static GRWorkList *MakeBFSBlockDFSContents();
 };
+
+} // end GR namespace
+
 } // end clang namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/MemRegion.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/MemRegion.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/MemRegion.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/MemRegion.h Wed Dec 22 12:53:20 2010
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_MEMREGION_H
-#define LLVM_CLANG_ANALYSIS_MEMREGION_H
+#ifndef LLVM_CLANG_GR_MEMREGION_H
+#define LLVM_CLANG_GR_MEMREGION_H
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
@@ -31,10 +31,13 @@
 
 namespace clang {
 
-class MemRegionManager;
-class MemSpaceRegion;
 class LocationContext;
 class StackFrameContext;
+
+namespace GR {
+
+class MemRegionManager;
+class MemSpaceRegion;
 class SValBuilder;
 class VarRegion;
 class CodeTextRegion;
@@ -1055,6 +1058,8 @@
   return getMemRegionManager()->getContext();
 }
   
+} // end GR namespace
+
 } // end clang namespace
 
 //===----------------------------------------------------------------------===//
@@ -1063,7 +1068,7 @@
 
 namespace llvm {
 static inline raw_ostream& operator<<(raw_ostream& os,
-                                      const clang::MemRegion* R) {
+                                      const clang::GR::MemRegion* R) {
   R->dumpToStream(os);
   return os;
 }

Modified: cfe/trunk/include/clang/GR/PathSensitive/SValBuilder.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/SValBuilder.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/SValBuilder.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/SValBuilder.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SVALBUILDER
-#define LLVM_CLANG_ANALYSIS_SVALBUILDER
+#ifndef LLVM_CLANG_GR_SVALBUILDER
+#define LLVM_CLANG_GR_SVALBUILDER
 
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
@@ -23,6 +23,8 @@
 
 namespace clang {
 
+namespace GR {
+
 class GRState;
 
 class SValBuilder {
@@ -242,5 +244,8 @@
                                      ASTContext &context,
                                      GRStateManager &stateMgr);
 
+} // end GR namespace
+
 } // end clang namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/SVals.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/SVals.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/SVals.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/SVals.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_RVALUE_H
-#define LLVM_CLANG_ANALYSIS_RVALUE_H
+#ifndef LLVM_CLANG_GR_RVALUE_H
+#define LLVM_CLANG_GR_RVALUE_H
 
 #include "clang/GR/PathSensitive/SymbolManager.h"
 #include "llvm/Support/Casting.h"
@@ -29,6 +29,8 @@
 
 namespace clang {
 
+namespace GR {
+
 class CompoundValData;
 class LazyCompoundValData;
 class GRState;
@@ -340,7 +342,7 @@
 };
 
 class LocAsInteger : public NonLoc {
-  friend class clang::SValBuilder;
+  friend class GR::SValBuilder;
 
   explicit LocAsInteger(const std::pair<SVal, uintptr_t>& data) :
     NonLoc(LocAsIntegerKind, &data) {
@@ -374,7 +376,7 @@
 };
 
 class CompoundVal : public NonLoc {
-  friend class clang::SValBuilder;
+  friend class GR::SValBuilder;
 
   explicit CompoundVal(const CompoundValData* D) : NonLoc(CompoundValKind, D) {}
 
@@ -397,7 +399,7 @@
 };
 
 class LazyCompoundVal : public NonLoc {
-  friend class clang::SValBuilder;
+  friend class GR::SValBuilder;
 
   explicit LazyCompoundVal(const LazyCompoundValData *D)
     : NonLoc(LazyCompoundValKind, D) {}
@@ -417,7 +419,7 @@
   }
 };
 
-} // end namespace clang::nonloc
+} // end namespace GR::nonloc
 
 //==------------------------------------------------------------------------==//
 //  Subclasses of Loc.
@@ -503,14 +505,18 @@
   }
 };
 
-} // end clang::loc namespace
+} // end GR::loc namespace
+} // end GR namespace
+
 } // end clang namespace
 
 namespace llvm {
 static inline llvm::raw_ostream& operator<<(llvm::raw_ostream& os,
-                                            clang::SVal V) {
+                                            clang::GR::SVal V) {
   V.dumpToStream(os);
   return os;
 }
+
 } // end llvm namespace
+
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/Store.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/Store.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/Store.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/Store.h Wed Dec 22 12:53:20 2010
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_STORE_H
-#define LLVM_CLANG_ANALYSIS_STORE_H
+#ifndef LLVM_CLANG_GR_STORE_H
+#define LLVM_CLANG_GR_STORE_H
 
 #include "clang/GR/PathSensitive/MemRegion.h"
 #include "clang/GR/PathSensitive/SValBuilder.h"
@@ -21,6 +21,13 @@
 
 namespace clang {
 
+class Stmt;
+class Expr;
+class ObjCIvarDecl;
+class StackFrameContext;
+
+namespace GR {
+
 /// Store - This opaque type encapsulates an immutable mapping from
 ///  locations to values.  At a high-level, it represents the symbolic
 ///  memory model.  Different subclasses of StoreManager may choose
@@ -29,11 +36,7 @@
 
 class GRState;
 class GRStateManager;
-class Stmt;
-class Expr;
-class ObjCIvarDecl;
 class SubRegionMap;
-class StackFrameContext;
 
 class StoreManager {
 protected:
@@ -248,6 +251,9 @@
 StoreManager *CreateRegionStoreManager(GRStateManager& StMgr);
 StoreManager *CreateFieldsOnlyRegionStoreManager(GRStateManager& StMgr);
 StoreManager *CreateFlatStoreManager(GRStateManager &StMgr);
+
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/SummaryManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/SummaryManager.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/SummaryManager.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/SummaryManager.h Wed Dec 22 12:53:20 2010
@@ -12,14 +12,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CHECKER_SUMMARY
-#define LLVM_CLANG_CHECKER_SUMMARY
+#ifndef LLVM_CLANG_GR_SUMMARY
+#define LLVM_CLANG_GR_SUMMARY
 
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/Support/Allocator.h"
 
 namespace clang {
 
+namespace GR {
+
 namespace summMgr {
 
   
@@ -52,6 +54,8 @@
   
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/include/clang/GR/PathSensitive/SymbolManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/GR/PathSensitive/SymbolManager.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/include/clang/GR/PathSensitive/SymbolManager.h (original)
+++ cfe/trunk/include/clang/GR/PathSensitive/SymbolManager.h Wed Dec 22 12:53:20 2010
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SYMMGR_H
-#define LLVM_CLANG_ANALYSIS_SYMMGR_H
+#ifndef LLVM_CLANG_GR_SYMMGR_H
+#define LLVM_CLANG_GR_SYMMGR_H
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
@@ -29,12 +29,14 @@
 
 namespace clang {
   class ASTContext;
+  class StackFrameContext;
+
+namespace GR {
   class BasicValueFactory;
   class MemRegion;
   class SubRegion;
   class TypedRegion;
   class VarRegion;
-  class StackFrameContext;
 
 class SymExpr : public llvm::FoldingSetNode {
 public:
@@ -473,11 +475,13 @@
   virtual ~SymbolVisitor();
 };
 
+} // end GR namespace
+
 } // end clang namespace
 
 namespace llvm {
 static inline llvm::raw_ostream& operator<<(llvm::raw_ostream& os,
-                                            const clang::SymExpr *SE) {
+                                            const clang::GR::SymExpr *SE) {
   SE->dumpToStream(os);
   return os;
 }

Modified: cfe/trunk/lib/Analysis/CocoaConventions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CocoaConventions.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/CocoaConventions.cpp (original)
+++ cfe/trunk/lib/Analysis/CocoaConventions.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "llvm/ADT/StringExtras.h"
 
 using namespace clang;
+using namespace GR;
 
 using llvm::StringRef;
 

Modified: cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp (original)
+++ cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp Wed Dec 22 12:53:20 2010
@@ -80,7 +80,7 @@
   case RewriteMacros:          return new RewriteMacrosAction();
   case RewriteObjC:            return new RewriteObjCAction();
   case RewriteTest:            return new RewriteTestAction();
-  case RunAnalysis:            return new AnalysisAction();
+  case RunAnalysis:            return new GR::AnalysisAction();
   case RunPreprocessorOnly:    return new PreprocessOnlyAction();
   }
 }

Modified: cfe/trunk/lib/GR/AggExprVisitor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/AggExprVisitor.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/AggExprVisitor.cpp (original)
+++ cfe/trunk/lib/GR/AggExprVisitor.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/AST/StmtVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 /// AggExprVisitor is designed after AggExprEmitter of the CodeGen module.  It

Modified: cfe/trunk/lib/GR/AnalysisConsumer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/AnalysisConsumer.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/AnalysisConsumer.cpp (original)
+++ cfe/trunk/lib/GR/AnalysisConsumer.cpp Wed Dec 22 12:53:20 2010
@@ -43,6 +43,7 @@
 #include "llvm/ADT/OwningPtr.h"
 
 using namespace clang;
+using namespace GR;
 
 static ExplodedNode::Auditor* CreateUbiViz();
 
@@ -473,7 +474,7 @@
 // AnalysisConsumer creation.
 //===----------------------------------------------------------------------===//
 
-ASTConsumer* clang::CreateAnalysisConsumer(const Preprocessor& pp,
+ASTConsumer* GR::CreateAnalysisConsumer(const Preprocessor& pp,
                                            const std::string& OutDir,
                                            const AnalyzerOptions& Opts) {
   llvm::OwningPtr<AnalysisConsumer> C(new AnalysisConsumer(pp, OutDir, Opts));

Modified: cfe/trunk/lib/GR/AnalysisManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/AnalysisManager.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/AnalysisManager.cpp (original)
+++ cfe/trunk/lib/GR/AnalysisManager.cpp Wed Dec 22 12:53:20 2010
@@ -12,6 +12,7 @@
 #include "clang/Index/Indexer.h"
 
 using namespace clang;
+using namespace GR;
 
 AnalysisContext *
 AnalysisManager::getAnalysisContextInAnotherTU(const Decl *D) {

Modified: cfe/trunk/lib/GR/AnalyzerStatsChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/AnalyzerStatsChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/AnalyzerStatsChecker.cpp (original)
+++ cfe/trunk/lib/GR/AnalyzerStatsChecker.cpp Wed Dec 22 12:53:20 2010
@@ -20,6 +20,7 @@
 #include "llvm/ADT/SmallPtrSet.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class AnalyzerStatsChecker : public CheckerVisitor<AnalyzerStatsChecker> {
@@ -37,7 +38,7 @@
   return &x;
 }
 
-void clang::RegisterAnalyzerStatsChecker(GRExprEngine &Eng) {
+void GR::RegisterAnalyzerStatsChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new AnalyzerStatsChecker());
 }
 

Modified: cfe/trunk/lib/GR/BasicConstraintManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/BasicConstraintManager.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/BasicConstraintManager.cpp (original)
+++ cfe/trunk/lib/GR/BasicConstraintManager.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 
 namespace { class ConstNotEq {}; }
@@ -31,6 +32,7 @@
 static int ConstNotEqIndex = 0;
 
 namespace clang {
+namespace GR {
 template<>
 struct GRStateTrait<ConstNotEq> : public GRStatePartialTrait<ConstNotEqTy> {
   static inline void* GDMIndex() { return &ConstNotEqIndex; }
@@ -41,6 +43,7 @@
   static inline void* GDMIndex() { return &ConstEqIndex; }
 };
 }
+}
 
 namespace {
 // BasicConstraintManager only tracks equality and inequality constraints of
@@ -95,7 +98,7 @@
 
 } // end anonymous namespace
 
-ConstraintManager* clang::CreateBasicConstraintManager(GRStateManager& statemgr,
+ConstraintManager* GR::CreateBasicConstraintManager(GRStateManager& statemgr,
                                                        GRSubEngine &subengine) {
   return new BasicConstraintManager(statemgr, subengine);
 }

Modified: cfe/trunk/lib/GR/BasicStore.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/BasicStore.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/BasicStore.cpp (original)
+++ cfe/trunk/lib/GR/BasicStore.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
+using namespace GR;
 
 typedef llvm::ImmutableMap<const MemRegion*,SVal> BindingsTy;
 
@@ -103,7 +104,7 @@
 } // end anonymous namespace
 
 
-StoreManager* clang::CreateBasicStoreManager(GRStateManager& StMgr) {
+StoreManager* GR::CreateBasicStoreManager(GRStateManager& StMgr) {
   return new BasicStoreManager(StMgr);
 }
 

Modified: cfe/trunk/lib/GR/BasicValueFactory.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/BasicValueFactory.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/BasicValueFactory.cpp (original)
+++ cfe/trunk/lib/GR/BasicValueFactory.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/GR/PathSensitive/BasicValueFactory.h"
 
 using namespace clang;
+using namespace GR;
 
 void CompoundValData::Profile(llvm::FoldingSetNodeID& ID, QualType T,
                               llvm::ImmutableList<SVal> L) {

Modified: cfe/trunk/lib/GR/BugReporter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/BugReporter.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/BugReporter.cpp (original)
+++ cfe/trunk/lib/GR/BugReporter.cpp Wed Dec 22 12:53:20 2010
@@ -30,6 +30,7 @@
 #include <queue>
 
 using namespace clang;
+using namespace GR;
 
 BugReporterVisitor::~BugReporterVisitor() {}
 BugReporterContext::~BugReporterContext() {

Modified: cfe/trunk/lib/GR/BugReporterVisitors.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/BugReporterVisitors.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/BugReporterVisitors.cpp (original)
+++ cfe/trunk/lib/GR/BugReporterVisitors.cpp Wed Dec 22 12:53:20 2010
@@ -20,12 +20,13 @@
 #include "clang/GR/PathSensitive/GRState.h"
 
 using namespace clang;
+using namespace GR;
 
 //===----------------------------------------------------------------------===//
 // Utility functions.
 //===----------------------------------------------------------------------===//
 
-const Stmt *clang::bugreporter::GetDerefExpr(const ExplodedNode *N) {
+const Stmt *bugreporter::GetDerefExpr(const ExplodedNode *N) {
   // Pattern match for a few useful cases (do something smarter later):
   //   a[0], p->f, *p
   const Stmt *S = N->getLocationAs<PostStmt>()->getStmt();
@@ -46,16 +47,14 @@
   return NULL;
 }
 
-const Stmt*
-clang::bugreporter::GetDenomExpr(const ExplodedNode *N) {
+const Stmt *bugreporter::GetDenomExpr(const ExplodedNode *N) {
   const Stmt *S = N->getLocationAs<PreStmt>()->getStmt();
   if (const BinaryOperator *BE = dyn_cast<BinaryOperator>(S))
     return BE->getRHS();
   return NULL;
 }
 
-const Stmt*
-clang::bugreporter::GetCalleeExpr(const ExplodedNode *N) {
+const Stmt *bugreporter::GetCalleeExpr(const ExplodedNode *N) {
   // Callee is checked as a PreVisit to the CallExpr.
   const Stmt *S = N->getLocationAs<PreStmt>()->getStmt();
   if (const CallExpr *CE = dyn_cast<CallExpr>(S))
@@ -63,8 +62,7 @@
   return NULL;
 }
 
-const Stmt*
-clang::bugreporter::GetRetValExpr(const ExplodedNode *N) {
+const Stmt *bugreporter::GetRetValExpr(const ExplodedNode *N) {
   const Stmt *S = N->getLocationAs<PostStmt>()->getStmt();
   if (const ReturnStmt *RS = dyn_cast<ReturnStmt>(S))
     return RS->getRetValue();
@@ -306,9 +304,9 @@
   BRC.addVisitor(new TrackConstraintBRVisitor(Constraint, Assumption));
 }
 
-void clang::bugreporter::registerTrackNullOrUndefValue(BugReporterContext& BRC,
-                                                       const void *data,
-                                                       const ExplodedNode* N) {
+void bugreporter::registerTrackNullOrUndefValue(BugReporterContext& BRC,
+                                                const void *data,
+                                                const ExplodedNode* N) {
 
   const Stmt *S = static_cast<const Stmt*>(data);
 
@@ -354,9 +352,9 @@
   }
 }
 
-void clang::bugreporter::registerFindLastStore(BugReporterContext& BRC,
-                                               const void *data,
-                                               const ExplodedNode* N) {
+void bugreporter::registerFindLastStore(BugReporterContext& BRC,
+                                        const void *data,
+                                        const ExplodedNode* N) {
 
   const MemRegion *R = static_cast<const MemRegion*>(data);
 
@@ -417,12 +415,12 @@
 };
 } // end anonymous namespace
 
-void clang::bugreporter::registerNilReceiverVisitor(BugReporterContext &BRC) {
+void bugreporter::registerNilReceiverVisitor(BugReporterContext &BRC) {
   BRC.addVisitor(new NilReceiverVisitor());
 }
 
 // Registers every VarDecl inside a Stmt with a last store vistor.
-void clang::bugreporter::registerVarDeclsLastStore(BugReporterContext &BRC,
+void bugreporter::registerVarDeclsLastStore(BugReporterContext &BRC,
                                                    const void *stmt,
                                                    const ExplodedNode *N) {
   const Stmt *S = static_cast<const Stmt *>(stmt);

Modified: cfe/trunk/lib/GR/CFRefCount.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/CFRefCount.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/CFRefCount.cpp (original)
+++ cfe/trunk/lib/GR/CFRefCount.cpp Wed Dec 22 12:53:20 2010
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 
 using namespace clang;
+using namespace GR;
 using llvm::StringRef;
 using llvm::StrInStrNoCase;
 
@@ -396,6 +397,7 @@
 typedef llvm::ImmutableMap<SymbolRef, RefVal> RefBindings;
 
 namespace clang {
+namespace GR {
   template<>
   struct GRStateTrait<RefBindings> : public GRStatePartialTrait<RefBindings> {
     static void* GDMIndex() {
@@ -404,6 +406,7 @@
     }
   };
 }
+}
 
 //===----------------------------------------------------------------------===//
 // Summaries
@@ -1576,6 +1579,7 @@
 namespace { class AutoreleaseStack {}; }
 
 namespace clang {
+namespace GR {
 template<> struct GRStateTrait<AutoreleaseStack>
   : public GRStatePartialTrait<ARStack> {
   static inline void* GDMIndex() { return &AutoRBIndex; }
@@ -1585,6 +1589,7 @@
   : public GRStatePartialTrait<ARPoolContents> {
   static inline void* GDMIndex() { return &AutoRCIndex; }
 };
+} // end GR namespace
 } // end clang namespace
 
 static SymbolRef GetCurrentAutoreleasePool(const GRState* state) {
@@ -3489,7 +3494,7 @@
   Eng.registerCheck(new RetainReleaseChecker(this));
 }
 
-GRTransferFuncs* clang::MakeCFRefCountTF(ASTContext& Ctx, bool GCEnabled,
+GRTransferFuncs* GR::MakeCFRefCountTF(ASTContext& Ctx, bool GCEnabled,
                                          const LangOptions& lopts) {
   return new CFRefCount(Ctx, GCEnabled, lopts);
 }

Modified: cfe/trunk/lib/GR/Checker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checker.cpp (original)
+++ cfe/trunk/lib/GR/Checker.cpp Wed Dec 22 12:53:20 2010
@@ -14,6 +14,7 @@
 
 #include "clang/GR/PathSensitive/Checker.h"
 using namespace clang;
+using namespace GR;
 
 Checker::~Checker() {}
 

Modified: cfe/trunk/lib/GR/CheckerHelpers.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/CheckerHelpers.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/CheckerHelpers.cpp (original)
+++ cfe/trunk/lib/GR/CheckerHelpers.cpp Wed Dec 22 12:53:20 2010
@@ -15,7 +15,7 @@
 #include "clang/AST/Expr.h"
 
 // Recursively find any substatements containing macros
-bool clang::containsMacro(const Stmt *S) {
+bool clang::GR::containsMacro(const Stmt *S) {
   if (S->getLocStart().isMacroID())
     return true;
 
@@ -32,7 +32,7 @@
 }
 
 // Recursively find any substatements containing enum constants
-bool clang::containsEnum(const Stmt *S) {
+bool clang::GR::containsEnum(const Stmt *S) {
   const DeclRefExpr *DR = dyn_cast<DeclRefExpr>(S);
 
   if (DR && isa<EnumConstantDecl>(DR->getDecl()))
@@ -48,7 +48,7 @@
 }
 
 // Recursively find any substatements containing static vars
-bool clang::containsStaticLocal(const Stmt *S) {
+bool clang::GR::containsStaticLocal(const Stmt *S) {
   const DeclRefExpr *DR = dyn_cast<DeclRefExpr>(S);
 
   if (DR)
@@ -66,7 +66,7 @@
 }
 
 // Recursively find any substatements containing __builtin_offsetof
-bool clang::containsBuiltinOffsetOf(const Stmt *S) {
+bool clang::GR::containsBuiltinOffsetOf(const Stmt *S) {
   if (isa<OffsetOfExpr>(S))
     return true;
 

Modified: cfe/trunk/lib/GR/Checkers/AdjustedReturnValueChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/AdjustedReturnValueChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/AdjustedReturnValueChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/AdjustedReturnValueChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class AdjustedReturnValueChecker : 
@@ -34,7 +35,7 @@
 };
 }
 
-void clang::RegisterAdjustedReturnValueChecker(GRExprEngine &Eng) {
+void GR::RegisterAdjustedReturnValueChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new AdjustedReturnValueChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/ArrayBoundChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/ArrayBoundChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/ArrayBoundChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/ArrayBoundChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class ArrayBoundChecker : 
@@ -30,7 +31,7 @@
 };
 }
 
-void clang::RegisterArrayBoundChecker(GRExprEngine &Eng) {
+void GR::RegisterArrayBoundChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new ArrayBoundChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/AttrNonNullChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/AttrNonNullChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/AttrNonNullChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/AttrNonNullChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class AttrNonNullChecker
@@ -32,7 +33,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterAttrNonNullChecker(GRExprEngine &Eng) {
+void GR::RegisterAttrNonNullChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new AttrNonNullChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.cpp Wed Dec 22 12:53:20 2010
@@ -29,6 +29,7 @@
 #include "clang/AST/ASTContext.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class APIMisuse : public BugType {
@@ -510,7 +511,7 @@
 // Check registration.
 //===----------------------------------------------------------------------===//
   
-void clang::RegisterAppleChecks(GRExprEngine& Eng, const Decl &D) {
+void GR::RegisterAppleChecks(GRExprEngine& Eng, const Decl &D) {
   Eng.registerCheck(new NilArgChecker());
   Eng.registerCheck(new CFNumberCreateChecker());
   RegisterNSErrorChecks(Eng.getBugReporter(), Eng, D);

Modified: cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.h (original)
+++ cfe/trunk/lib/GR/Checkers/BasicObjCFoundationChecks.h Wed Dec 22 12:53:20 2010
@@ -13,19 +13,24 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_BASICOBJCFOUNDATIONCHECKS
-#define LLVM_CLANG_ANALYSIS_BASICOBJCFOUNDATIONCHECKS
+#ifndef LLVM_CLANG_GR_BASICOBJCFOUNDATIONCHECKS
+#define LLVM_CLANG_GR_BASICOBJCFOUNDATIONCHECKS
 
 namespace clang {
 
 class ASTContext;
-class BugReporter;
 class Decl;
+
+namespace GR {
+
+class BugReporter;
 class GRExprEngine;
 
 void RegisterNSErrorChecks(BugReporter& BR, GRExprEngine &Eng, const Decl &D);
 void RegisterNSAutoreleasePoolChecks(GRExprEngine &Eng);
 
+} // end GR namespace
+
 } // end clang namespace
 
 #endif

Modified: cfe/trunk/lib/GR/Checkers/BuiltinFunctionChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/BuiltinFunctionChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/BuiltinFunctionChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/BuiltinFunctionChecker.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/Basic/Builtins.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -27,7 +28,7 @@
 
 }
 
-void clang::RegisterBuiltinFunctionChecker(GRExprEngine &Eng) {
+void GR::RegisterBuiltinFunctionChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new BuiltinFunctionChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/CStringChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CStringChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CStringChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CStringChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "llvm/ADT/StringSwitch.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class CStringChecker : public CheckerVisitor<CStringChecker> {
@@ -99,14 +100,16 @@
 } //end anonymous namespace
 
 namespace clang {
+namespace GR {
   template <>
   struct GRStateTrait<CStringLength> 
     : public GRStatePartialTrait<CStringLength::EntryMap> {
     static void *GDMIndex() { return CStringChecker::getTag(); }
   };
 }
+}
 
-void clang::RegisterCStringChecker(GRExprEngine &Eng) {
+void GR::RegisterCStringChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new CStringChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/CallAndMessageChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CallAndMessageChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CallAndMessageChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CallAndMessageChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class CallAndMessageChecker
@@ -61,7 +62,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterCallAndMessageChecker(GRExprEngine &Eng) {
+void GR::RegisterCallAndMessageChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new CallAndMessageChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/CastSizeChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CastSizeChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CastSizeChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CastSizeChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "GRExprEngineInternalChecks.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class CastSizeChecker : public CheckerVisitor<CastSizeChecker> {
@@ -85,6 +86,6 @@
 }
 
 
-void clang::RegisterCastSizeChecker(GRExprEngine &Eng) {
+void GR::RegisterCastSizeChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new CastSizeChecker());
 }

Modified: cfe/trunk/lib/GR/Checkers/CastToStructChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CastToStructChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CastToStructChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CastToStructChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "GRExprEngineInternalChecks.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class CastToStructChecker 
@@ -73,6 +74,6 @@
   }
 }
 
-void clang::RegisterCastToStructChecker(GRExprEngine &Eng) {
+void GR::RegisterCastToStructChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new CastToStructChecker());
 }

Modified: cfe/trunk/lib/GR/Checkers/CheckDeadStores.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CheckDeadStores.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CheckDeadStores.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CheckDeadStores.cpp Wed Dec 22 12:53:20 2010
@@ -24,6 +24,7 @@
 #include "llvm/ADT/SmallPtrSet.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -280,7 +281,7 @@
 } // end anonymous namespace
 
 
-void clang::CheckDeadStores(CFG &cfg, LiveVariables &L, ParentMap &pmap, 
+void GR::CheckDeadStores(CFG &cfg, LiveVariables &L, ParentMap &pmap, 
                             BugReporter& BR) {
   FindEscaped FS(&cfg);
   FS.getCFG().VisitBlockStmts(FS);

Modified: cfe/trunk/lib/GR/Checkers/CheckObjCDealloc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CheckObjCDealloc.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CheckObjCDealloc.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CheckObjCDealloc.cpp Wed Dec 22 12:53:20 2010
@@ -23,6 +23,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 static bool scan_dealloc(Stmt* S, Selector Dealloc) {
 
@@ -93,8 +94,8 @@
   return false;
 }
 
-void clang::CheckObjCDealloc(const ObjCImplementationDecl* D,
-                             const LangOptions& LOpts, BugReporter& BR) {
+void GR::CheckObjCDealloc(const ObjCImplementationDecl* D,
+                          const LangOptions& LOpts, BugReporter& BR) {
 
   assert (LOpts.getGCMode() != LangOptions::GCOnly);
 

Modified: cfe/trunk/lib/GR/Checkers/CheckObjCInstMethSignature.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CheckObjCInstMethSignature.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CheckObjCInstMethSignature.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CheckObjCInstMethSignature.cpp Wed Dec 22 12:53:20 2010
@@ -24,6 +24,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 static bool AreTypesCompatible(QualType Derived, QualType Ancestor,
                                ASTContext& C) {
@@ -69,8 +70,8 @@
   }
 }
 
-void clang::CheckObjCInstMethSignature(const ObjCImplementationDecl* ID,
-                                       BugReporter& BR) {
+void GR::CheckObjCInstMethSignature(const ObjCImplementationDecl* ID,
+                                    BugReporter& BR) {
 
   const ObjCInterfaceDecl* D = ID->getClassInterface();
   const ObjCInterfaceDecl* C = D->getSuperClass();

Modified: cfe/trunk/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 static bool isArc4RandomAvailable(const ASTContext &Ctx) {
   const llvm::Triple &T = Ctx.Target.getTriple();
@@ -496,7 +497,7 @@
 // Entry point for check.
 //===----------------------------------------------------------------------===//
 
-void clang::CheckSecuritySyntaxOnly(const Decl *D, BugReporter &BR) {
+void GR::CheckSecuritySyntaxOnly(const Decl *D, BugReporter &BR) {
   WalkAST walker(BR);
   walker.Visit(D->getBody());
 }

Modified: cfe/trunk/lib/GR/Checkers/CheckSizeofPointer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/CheckSizeofPointer.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/CheckSizeofPointer.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/CheckSizeofPointer.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/Checkers/LocalCheckers.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class WalkAST : public StmtVisitor<WalkAST> {
@@ -65,7 +66,7 @@
   }
 }
 
-void clang::CheckSizeofPointer(const Decl *D, BugReporter &BR) {
+void GR::CheckSizeofPointer(const Decl *D, BugReporter &BR) {
   WalkAST walker(BR);
   walker.Visit(D->getBody());
 }

Modified: cfe/trunk/lib/GR/Checkers/ChrootChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/ChrootChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/ChrootChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/ChrootChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -58,7 +59,7 @@
 
 } // end anonymous namespace
 
-void clang::RegisterChrootChecker(GRExprEngine &Eng) {
+void GR::RegisterChrootChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new ChrootChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/DereferenceChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/DereferenceChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/DereferenceChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/DereferenceChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class DereferenceChecker : public Checker {
@@ -42,12 +43,12 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterDereferenceChecker(GRExprEngine &Eng) {
+void GR::RegisterDereferenceChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new DereferenceChecker());
 }
 
 std::pair<ExplodedNode * const *, ExplodedNode * const *>
-clang::GetImplicitNullDereferences(GRExprEngine &Eng) {
+GR::GetImplicitNullDereferences(GRExprEngine &Eng) {
   DereferenceChecker *checker = Eng.getChecker<DereferenceChecker>();
   if (!checker)
     return std::make_pair((ExplodedNode * const *) 0,

Modified: cfe/trunk/lib/GR/Checkers/DivZeroChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/DivZeroChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/DivZeroChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/DivZeroChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class DivZeroChecker : public CheckerVisitor<DivZeroChecker> {
@@ -28,7 +29,7 @@
 };  
 } // end anonymous namespace
 
-void clang::RegisterDivZeroChecker(GRExprEngine &Eng) {
+void GR::RegisterDivZeroChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new DivZeroChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/FixedAddressChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/FixedAddressChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/FixedAddressChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/FixedAddressChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class FixedAddressChecker 
@@ -66,6 +67,6 @@
   }
 }
 
-void clang::RegisterFixedAddressChecker(GRExprEngine &Eng) {
+void GR::RegisterFixedAddressChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new FixedAddressChecker());
 }

Modified: cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.cpp Wed Dec 22 12:53:20 2010
@@ -17,8 +17,9 @@
 #include "clang/GR/Checkers/LocalCheckers.h"
 
 using namespace clang;
+using namespace GR;
 
-void clang::RegisterExperimentalChecks(GRExprEngine &Eng) {
+void GR::RegisterExperimentalChecks(GRExprEngine &Eng) {
   // These are checks that never belong as internal checks
   // within GRExprEngine.
   RegisterCStringChecker(Eng);
@@ -29,7 +30,7 @@
   RegisterUnreachableCodeChecker(Eng);
 }
 
-void clang::RegisterExperimentalInternalChecks(GRExprEngine &Eng) {
+void GR::RegisterExperimentalInternalChecks(GRExprEngine &Eng) {
   // These are internal checks that should eventually migrate to
   // RegisterInternalChecks() once they have been further tested.
   

Modified: cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.h (original)
+++ cfe/trunk/lib/GR/Checkers/GRExprEngineExperimentalChecks.h Wed Dec 22 12:53:20 2010
@@ -12,11 +12,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_GREXPRENGINE_EXPERIMENTAL_CHECKS
-#define LLVM_CLANG_GREXPRENGINE_EXPERIMENTAL_CHECKS
+#ifndef LLVM_CLANG_GR_GREXPRENGINE_EXPERIMENTAL_CHECKS
+#define LLVM_CLANG_GR_GREXPRENGINE_EXPERIMENTAL_CHECKS
 
 namespace clang {
 
+namespace GR {
+
 class GRExprEngine;
 
 void RegisterAnalyzerStatsChecker(GRExprEngine &Eng);
@@ -28,5 +30,8 @@
 void RegisterStreamChecker(GRExprEngine &Eng);
 void RegisterUnreachableCodeChecker(GRExprEngine &Eng);
 
+} // end GR namespace
+
 } // end clang namespace
+
 #endif

Modified: cfe/trunk/lib/GR/Checkers/GRExprEngineInternalChecks.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/GRExprEngineInternalChecks.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/GRExprEngineInternalChecks.h (original)
+++ cfe/trunk/lib/GR/Checkers/GRExprEngineInternalChecks.h Wed Dec 22 12:53:20 2010
@@ -12,11 +12,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_GREXPRENGINE_INTERNAL_CHECKS
-#define LLVM_CLANG_GREXPRENGINE_INTERNAL_CHECKS
+#ifndef LLVM_CLANG_GR_GREXPRENGINE_INTERNAL_CHECKS
+#define LLVM_CLANG_GR_GREXPRENGINE_INTERNAL_CHECKS
 
 namespace clang {
 
+namespace GR {
+
 class GRExprEngine;
 
 // Foundational checks that handle basic semantics.
@@ -49,5 +51,8 @@
 void RegisterOSAtomicChecker(GRExprEngine &Eng);
 void RegisterUnixAPIChecker(GRExprEngine &Eng);
 
+} // end GR namespace
+
 } // end clang namespace
+
 #endif

Modified: cfe/trunk/lib/GR/Checkers/IdempotentOperationChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/IdempotentOperationChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/IdempotentOperationChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/IdempotentOperationChecker.cpp Wed Dec 22 12:53:20 2010
@@ -58,6 +58,7 @@
 #include <deque>
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class IdempotentOperationChecker
@@ -129,7 +130,7 @@
   return &x;
 }
 
-void clang::RegisterIdempotentOperationChecker(GRExprEngine &Eng) {
+void GR::RegisterIdempotentOperationChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new IdempotentOperationChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/LLVMConventionsChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/LLVMConventionsChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/LLVMConventionsChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/LLVMConventionsChecker.cpp Wed Dec 22 12:53:20 2010
@@ -20,6 +20,7 @@
 #include "llvm/ADT/StringRef.h"
 
 using namespace clang;
+using namespace GR;
 
 //===----------------------------------------------------------------------===//
 // Generic type checking routines.
@@ -305,7 +306,7 @@
   }
 }
 
-void clang::CheckLLVMConventions(TranslationUnitDecl &TU,
+void GR::CheckLLVMConventions(TranslationUnitDecl &TU,
                                  BugReporter &BR) {
   ScanCodeDecls(&TU, BR);
 }

Modified: cfe/trunk/lib/GR/Checkers/MacOSXAPIChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/MacOSXAPIChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/MacOSXAPIChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/MacOSXAPIChecker.cpp Wed Dec 22 12:53:20 2010
@@ -25,6 +25,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class MacOSXAPIChecker : public CheckerVisitor<MacOSXAPIChecker> {
@@ -44,7 +45,7 @@
 };
 } //end anonymous namespace
 
-void clang::RegisterMacOSXAPIChecker(GRExprEngine &Eng) {
+void GR::RegisterMacOSXAPIChecker(GRExprEngine &Eng) {
   if (Eng.getContext().Target.getTriple().getVendor() == llvm::Triple::Apple)
     Eng.registerCheck(new MacOSXAPIChecker());
 }

Modified: cfe/trunk/lib/GR/Checkers/MallocChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/MallocChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/MallocChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/MallocChecker.cpp Wed Dec 22 12:53:20 2010
@@ -20,6 +20,7 @@
 #include "clang/GR/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -116,14 +117,16 @@
 typedef llvm::ImmutableMap<SymbolRef, RefState> RegionStateTy;
 
 namespace clang {
+namespace GR {
   template <>
   struct GRStateTrait<RegionState> 
     : public GRStatePartialTrait<RegionStateTy> {
     static void *GDMIndex() { return MallocChecker::getTag(); }
   };
 }
+}
 
-void clang::RegisterMallocChecker(GRExprEngine &Eng) {
+void GR::RegisterMallocChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new MallocChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp Wed Dec 22 12:53:20 2010
@@ -23,6 +23,7 @@
 #include "clang/AST/Decl.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class NSAutoreleasePoolChecker
@@ -44,7 +45,7 @@
 } // end anonymous namespace
 
 
-void clang::RegisterNSAutoreleasePoolChecks(GRExprEngine &Eng) {
+void GR::RegisterNSAutoreleasePoolChecks(GRExprEngine &Eng) {
   ASTContext &Ctx = Eng.getContext();
   if (Ctx.getLangOptions().getGCMode() != LangOptions::NonGC) {    
     Eng.registerCheck(new NSAutoreleasePoolChecker(GetNullarySelector("release",

Modified: cfe/trunk/lib/GR/Checkers/NSErrorChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/NSErrorChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/NSErrorChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/NSErrorChecker.cpp Wed Dec 22 12:53:20 2010
@@ -25,6 +25,7 @@
 #include "llvm/ADT/SmallVector.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class NSErrorChecker : public BugType {
@@ -62,7 +63,7 @@
 
 } // end anonymous namespace
 
-void clang::RegisterNSErrorChecks(BugReporter& BR, GRExprEngine &Eng,
+void GR::RegisterNSErrorChecks(BugReporter& BR, GRExprEngine &Eng,
                                   const Decl &D) {
   BR.Register(new NSErrorChecker(D, true, Eng));
   BR.Register(new NSErrorChecker(D, false, Eng));

Modified: cfe/trunk/lib/GR/Checkers/NoReturnFunctionChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/NoReturnFunctionChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/NoReturnFunctionChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/NoReturnFunctionChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "llvm/ADT/StringSwitch.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -28,7 +29,7 @@
 
 }
 
-void clang::RegisterNoReturnFunctionChecker(GRExprEngine &Eng) {
+void GR::RegisterNoReturnFunctionChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new NoReturnFunctionChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/OSAtomicChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/OSAtomicChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/OSAtomicChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/OSAtomicChecker.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/Basic/Builtins.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -30,7 +31,7 @@
 
 }
 
-void clang::RegisterOSAtomicChecker(GRExprEngine &Eng) {
+void GR::RegisterOSAtomicChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new OSAtomicChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/ObjCAtSyncChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/ObjCAtSyncChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/ObjCAtSyncChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/ObjCAtSyncChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class ObjCAtSyncChecker : public CheckerVisitor<ObjCAtSyncChecker> {
@@ -32,7 +33,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterObjCAtSyncChecker(GRExprEngine &Eng) {
+void GR::RegisterObjCAtSyncChecker(GRExprEngine &Eng) {
   // @synchronized is an Objective-C 2 feature.
   if (Eng.getContext().getLangOptions().ObjC2)
     Eng.registerCheck(new ObjCAtSyncChecker());

Modified: cfe/trunk/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp Wed Dec 22 12:53:20 2010
@@ -23,6 +23,7 @@
 #include "clang/Basic/SourceManager.h"
 
 using namespace clang;
+using namespace GR;
 
 enum IVarState { Unused, Used };
 typedef llvm::DenseMap<const ObjCIvarDecl*,IVarState> IvarUsageMap;
@@ -97,7 +98,7 @@
     }
 }
 
-void clang::CheckObjCUnusedIvar(const ObjCImplementationDecl *D,
+void GR::CheckObjCUnusedIvar(const ObjCImplementationDecl *D,
                                 BugReporter &BR) {
 
   const ObjCInterfaceDecl* ID = D->getClassInterface();

Modified: cfe/trunk/lib/GR/Checkers/PointerArithChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/PointerArithChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/PointerArithChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/PointerArithChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class PointerArithChecker 
@@ -66,6 +67,6 @@
   }
 }
 
-void clang::RegisterPointerArithChecker(GRExprEngine &Eng) {
+void GR::RegisterPointerArithChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new PointerArithChecker());
 }

Modified: cfe/trunk/lib/GR/Checkers/PointerSubChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/PointerSubChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/PointerSubChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/PointerSubChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class PointerSubChecker 
@@ -73,6 +74,6 @@
   }
 }
 
-void clang::RegisterPointerSubChecker(GRExprEngine &Eng) {
+void GR::RegisterPointerSubChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new PointerSubChecker());
 }

Modified: cfe/trunk/lib/GR/Checkers/PthreadLockChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/PthreadLockChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/PthreadLockChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/PthreadLockChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "llvm/ADT/ImmutableSet.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class PthreadLockChecker
@@ -44,13 +45,15 @@
 // GDM Entry for tracking lock state.
 namespace { class LockSet {}; }
 namespace clang {
+namespace GR {
 template <> struct GRStateTrait<LockSet> :
   public GRStatePartialTrait<llvm::ImmutableSet<const MemRegion*> > {
     static void* GDMIndex() { return PthreadLockChecker::getTag(); }
 };
+} // end GR namespace
 } // end clang namespace
 
-void clang::RegisterPthreadLockChecker(GRExprEngine &Eng) {
+void GR::RegisterPthreadLockChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new PthreadLockChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/ReturnPointerRangeChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/ReturnPointerRangeChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/ReturnPointerRangeChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/ReturnPointerRangeChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class ReturnPointerRangeChecker : 
@@ -30,7 +31,7 @@
 };
 }
 
-void clang::RegisterReturnPointerRangeChecker(GRExprEngine &Eng) {
+void GR::RegisterReturnPointerRangeChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new ReturnPointerRangeChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/ReturnUndefChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/ReturnUndefChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/ReturnUndefChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/ReturnUndefChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class ReturnUndefChecker : 
@@ -31,7 +32,7 @@
 };
 }
 
-void clang::RegisterReturnUndefChecker(GRExprEngine &Eng) {
+void GR::RegisterReturnUndefChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new ReturnUndefChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/StackAddrLeakChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/StackAddrLeakChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/StackAddrLeakChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/StackAddrLeakChecker.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/SmallString.h"
 using namespace clang;
+using namespace GR;
 
 namespace {
 class StackAddrLeakChecker : public CheckerVisitor<StackAddrLeakChecker> {
@@ -40,7 +41,7 @@
 };
 }
 
-void clang::RegisterStackAddrLeakChecker(GRExprEngine &Eng) {
+void GR::RegisterStackAddrLeakChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new StackAddrLeakChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/StreamChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/StreamChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/StreamChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/StreamChecker.cpp Wed Dec 22 12:53:20 2010
@@ -20,6 +20,7 @@
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -104,14 +105,16 @@
 } // end anonymous namespace
 
 namespace clang {
+namespace GR {
   template <>
   struct GRStateTrait<StreamState> 
     : public GRStatePartialTrait<llvm::ImmutableMap<SymbolRef, StreamState> > {
     static void *GDMIndex() { return StreamChecker::getTag(); }
   };
 }
+}
 
-void clang::RegisterStreamChecker(GRExprEngine &Eng) {
+void GR::RegisterStreamChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new StreamChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UndefBranchChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UndefBranchChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UndefBranchChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UndefBranchChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/PathSensitive/Checker.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 
@@ -55,7 +56,7 @@
 
 }
 
-void clang::RegisterUndefBranchChecker(GRExprEngine &Eng) {
+void GR::RegisterUndefBranchChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new UndefBranchChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class UndefCapturedBlockVarChecker
@@ -31,7 +32,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterUndefCapturedBlockVarChecker(GRExprEngine &Eng) {
+void GR::RegisterUndefCapturedBlockVarChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new UndefCapturedBlockVarChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UndefResultChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UndefResultChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UndefResultChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UndefResultChecker.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class UndefResultChecker 
@@ -32,7 +33,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterUndefResultChecker(GRExprEngine &Eng) {
+void GR::RegisterUndefResultChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new UndefResultChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class UndefinedArraySubscriptChecker
@@ -33,7 +34,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterUndefinedArraySubscriptChecker(GRExprEngine &Eng) {
+void GR::RegisterUndefinedArraySubscriptChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new UndefinedArraySubscriptChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UndefinedAssignmentChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UndefinedAssignmentChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UndefinedAssignmentChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UndefinedAssignmentChecker.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "clang/GR/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class UndefinedAssignmentChecker
@@ -30,7 +31,7 @@
 };
 }
 
-void clang::RegisterUndefinedAssignmentChecker(GRExprEngine &Eng){
+void GR::RegisterUndefinedAssignmentChecker(GRExprEngine &Eng){
   Eng.registerCheck(new UndefinedAssignmentChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UnixAPIChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UnixAPIChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UnixAPIChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UnixAPIChecker.cpp Wed Dec 22 12:53:20 2010
@@ -21,6 +21,7 @@
 #include <fcntl.h>
 
 using namespace clang;
+using namespace GR;
 using llvm::Optional;
 
 namespace {
@@ -45,7 +46,7 @@
 };
 } //end anonymous namespace
 
-void clang::RegisterUnixAPIChecker(GRExprEngine &Eng) {
+void GR::RegisterUnixAPIChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new UnixAPIChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/UnreachableCodeChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/UnreachableCodeChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/UnreachableCodeChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/UnreachableCodeChecker.cpp Wed Dec 22 12:53:20 2010
@@ -29,6 +29,7 @@
 #define DEFAULT_CFGBLOCKS 256
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class UnreachableCodeChecker : public Checker {
@@ -53,7 +54,7 @@
   return &x;
 }
 
-void clang::RegisterUnreachableCodeChecker(GRExprEngine &Eng) {
+void GR::RegisterUnreachableCodeChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new UnreachableCodeChecker());
 }
 

Modified: cfe/trunk/lib/GR/Checkers/VLASizeChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Checkers/VLASizeChecker.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Checkers/VLASizeChecker.cpp (original)
+++ cfe/trunk/lib/GR/Checkers/VLASizeChecker.cpp Wed Dec 22 12:53:20 2010
@@ -21,6 +21,7 @@
 #include "clang/GR/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class VLASizeChecker : public CheckerVisitor<VLASizeChecker> {
@@ -34,7 +35,7 @@
 };
 } // end anonymous namespace
 
-void clang::RegisterVLASizeChecker(GRExprEngine &Eng) {
+void GR::RegisterVLASizeChecker(GRExprEngine &Eng) {
   Eng.registerCheck(new VLASizeChecker());
 }
 

Modified: cfe/trunk/lib/GR/Environment.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Environment.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Environment.cpp (original)
+++ cfe/trunk/lib/GR/Environment.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/GR/PathSensitive/GRState.h"
 
 using namespace clang;
+using namespace GR;
 
 SVal Environment::lookupExpr(const Stmt* E) const {
   const SVal* X = ExprBindings.lookup(E);

Modified: cfe/trunk/lib/GR/ExplodedGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/ExplodedGraph.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/ExplodedGraph.cpp (original)
+++ cfe/trunk/lib/GR/ExplodedGraph.cpp Wed Dec 22 12:53:20 2010
@@ -21,6 +21,7 @@
 #include <vector>
 
 using namespace clang;
+using namespace GR;
 
 //===----------------------------------------------------------------------===//
 // Node auditing.

Modified: cfe/trunk/lib/GR/FlatStore.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/FlatStore.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/FlatStore.cpp (original)
+++ cfe/trunk/lib/GR/FlatStore.cpp Wed Dec 22 12:53:20 2010
@@ -12,6 +12,7 @@
 #include "llvm/Support/ErrorHandling.h"
 
 using namespace clang;
+using namespace GR;
 using llvm::Interval;
 
 // The actual store type.
@@ -83,7 +84,7 @@
 };
 } // end anonymous namespace
 
-StoreManager *clang::CreateFlatStoreManager(GRStateManager &StMgr) {
+StoreManager *GR::CreateFlatStoreManager(GRStateManager &StMgr) {
   return new FlatStoreManager(StMgr);
 }
 

Modified: cfe/trunk/lib/GR/FrontendActions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/FrontendActions.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/FrontendActions.cpp (original)
+++ cfe/trunk/lib/GR/FrontendActions.cpp Wed Dec 22 12:53:20 2010
@@ -11,6 +11,7 @@
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/GR/AnalysisConsumer.h"
 using namespace clang;
+using namespace GR;
 
 ASTConsumer *AnalysisAction::CreateASTConsumer(CompilerInstance &CI,
                                                llvm::StringRef InFile) {

Modified: cfe/trunk/lib/GR/GRBlockCounter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/GRBlockCounter.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/GRBlockCounter.cpp (original)
+++ cfe/trunk/lib/GR/GRBlockCounter.cpp Wed Dec 22 12:53:20 2010
@@ -17,6 +17,7 @@
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 

Modified: cfe/trunk/lib/GR/GRCXXExprEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/GRCXXExprEngine.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/GRCXXExprEngine.cpp (original)
+++ cfe/trunk/lib/GR/GRCXXExprEngine.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/AST/DeclCXX.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class CallExprWLItem {

Modified: cfe/trunk/lib/GR/GRCoreEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/GRCoreEngine.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/GRCoreEngine.cpp (original)
+++ cfe/trunk/lib/GR/GRCoreEngine.cpp Wed Dec 22 12:53:20 2010
@@ -25,12 +25,15 @@
 using llvm::cast;
 using llvm::isa;
 using namespace clang;
+using namespace GR;
 
 // This should be removed in the future.
 namespace clang {
+namespace GR {
 GRTransferFuncs* MakeCFRefCountTF(ASTContext& Ctx, bool GCEnabled,
                                   const LangOptions& lopts);
 }
+}
 
 //===----------------------------------------------------------------------===//
 // Worklist classes for exploration of reachable states.

Modified: cfe/trunk/lib/GR/GRExprEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/GRExprEngine.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/GRExprEngine.cpp (original)
+++ cfe/trunk/lib/GR/GRExprEngine.cpp Wed Dec 22 12:53:20 2010
@@ -37,6 +37,7 @@
 #endif
 
 using namespace clang;
+using namespace GR;
 using llvm::dyn_cast;
 using llvm::dyn_cast_or_null;
 using llvm::cast;

Modified: cfe/trunk/lib/GR/GRState.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/GRState.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/GRState.cpp (original)
+++ cfe/trunk/lib/GR/GRState.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 // Give the vtable for ConstraintManager somewhere to live.
 // FIXME: Move this elsewhere.

Modified: cfe/trunk/lib/GR/HTMLDiagnostics.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/HTMLDiagnostics.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/HTMLDiagnostics.cpp (original)
+++ cfe/trunk/lib/GR/HTMLDiagnostics.cpp Wed Dec 22 12:53:20 2010
@@ -26,6 +26,7 @@
 #include "llvm/Support/Path.h"
 
 using namespace clang;
+using namespace GR;
 
 //===----------------------------------------------------------------------===//
 // Boilerplate.
@@ -77,7 +78,7 @@
 }
 
 PathDiagnosticClient*
-clang::createHTMLDiagnosticClient(const std::string& prefix,
+GR::createHTMLDiagnosticClient(const std::string& prefix,
                                   const Preprocessor &PP) {
   return new HTMLDiagnostics(prefix, PP);
 }

Modified: cfe/trunk/lib/GR/ManagerRegistry.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/ManagerRegistry.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/ManagerRegistry.cpp (original)
+++ cfe/trunk/lib/GR/ManagerRegistry.cpp Wed Dec 22 12:53:20 2010
@@ -14,6 +14,7 @@
 #include "clang/GR/ManagerRegistry.h"
 
 using namespace clang;
+using namespace GR;
 
 StoreManagerCreator ManagerRegistry::StoreMgrCreator = 0;
 

Modified: cfe/trunk/lib/GR/MemRegion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/MemRegion.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/MemRegion.cpp (original)
+++ cfe/trunk/lib/GR/MemRegion.cpp Wed Dec 22 12:53:20 2010
@@ -22,6 +22,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 //===----------------------------------------------------------------------===//
 // MemRegion Construction.

Modified: cfe/trunk/lib/GR/PathDiagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/PathDiagnostic.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/PathDiagnostic.cpp (original)
+++ cfe/trunk/lib/GR/PathDiagnostic.cpp Wed Dec 22 12:53:20 2010
@@ -20,6 +20,7 @@
 #include "llvm/Support/Casting.h"
 
 using namespace clang;
+using namespace GR;
 using llvm::dyn_cast;
 using llvm::isa;
 

Modified: cfe/trunk/lib/GR/PlistDiagnostics.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/PlistDiagnostics.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/PlistDiagnostics.cpp (original)
+++ cfe/trunk/lib/GR/PlistDiagnostics.cpp Wed Dec 22 12:53:20 2010
@@ -21,6 +21,7 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallVector.h"
 using namespace clang;
+using namespace GR;
 using llvm::cast;
 
 typedef llvm::DenseMap<FileID, unsigned> FIDMap;
@@ -97,7 +98,7 @@
   : OutputFile(output), LangOpts(LO), SubPD(subPD), flushed(false) {}
 
 PathDiagnosticClient*
-clang::createPlistDiagnosticClient(const std::string& s, const Preprocessor &PP,
+GR::createPlistDiagnosticClient(const std::string& s, const Preprocessor &PP,
                                    PathDiagnosticClient *subPD) {
   return new PlistDiagnostics(s, PP.getLangOptions(), subPD);
 }

Modified: cfe/trunk/lib/GR/RangeConstraintManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/RangeConstraintManager.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/RangeConstraintManager.cpp (original)
+++ cfe/trunk/lib/GR/RangeConstraintManager.cpp Wed Dec 22 12:53:20 2010
@@ -23,6 +23,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace { class ConstraintRange {}; }
 static int ConstraintRangeIndex = 0;
@@ -194,12 +195,14 @@
 typedef llvm::ImmutableMap<SymbolRef,RangeSet> ConstraintRangeTy;
 
 namespace clang {
+namespace GR {
 template<>
 struct GRStateTrait<ConstraintRange>
   : public GRStatePartialTrait<ConstraintRangeTy> {
   static inline void* GDMIndex() { return &ConstraintRangeIndex; }
 };
 }
+}
 
 namespace {
 class RangeConstraintManager : public SimpleConstraintManager{
@@ -251,8 +254,8 @@
 
 } // end anonymous namespace
 
-ConstraintManager* clang::CreateRangeConstraintManager(GRStateManager&,
-                                                       GRSubEngine &subeng) {
+ConstraintManager* GR::CreateRangeConstraintManager(GRStateManager&,
+                                                    GRSubEngine &subeng) {
   return new RangeConstraintManager(subeng);
 }
 

Modified: cfe/trunk/lib/GR/RegionStore.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/RegionStore.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/RegionStore.cpp (original)
+++ cfe/trunk/lib/GR/RegionStore.cpp Wed Dec 22 12:53:20 2010
@@ -29,6 +29,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 using llvm::Optional;
 
 //===----------------------------------------------------------------------===//
@@ -403,12 +404,12 @@
 // RegionStore creation.
 //===----------------------------------------------------------------------===//
 
-StoreManager *clang::CreateRegionStoreManager(GRStateManager& StMgr) {
+StoreManager *GR::CreateRegionStoreManager(GRStateManager& StMgr) {
   RegionStoreFeatures F = maximal_features_tag();
   return new RegionStoreManager(StMgr, F);
 }
 
-StoreManager *clang::CreateFieldsOnlyRegionStoreManager(GRStateManager &StMgr) {
+StoreManager *GR::CreateFieldsOnlyRegionStoreManager(GRStateManager &StMgr) {
   RegionStoreFeatures F = minimal_features_tag();
   F.enableFields(true);
   return new RegionStoreManager(StMgr, F);

Modified: cfe/trunk/lib/GR/SValBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/SValBuilder.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/SValBuilder.cpp (original)
+++ cfe/trunk/lib/GR/SValBuilder.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,7 @@
 #include "clang/GR/PathSensitive/BasicValueFactory.h"
 
 using namespace clang;
+using namespace GR;
 
 //===----------------------------------------------------------------------===//
 // Basic SVal creation.

Modified: cfe/trunk/lib/GR/SVals.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/SVals.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/SVals.cpp (original)
+++ cfe/trunk/lib/GR/SVals.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/Basic/IdentifierTable.h"
 
 using namespace clang;
+using namespace GR;
 using llvm::dyn_cast;
 using llvm::cast;
 using llvm::APSInt;

Modified: cfe/trunk/lib/GR/SimpleConstraintManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/SimpleConstraintManager.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/SimpleConstraintManager.cpp (original)
+++ cfe/trunk/lib/GR/SimpleConstraintManager.cpp Wed Dec 22 12:53:20 2010
@@ -19,6 +19,8 @@
 
 namespace clang {
 
+namespace GR {
+
 SimpleConstraintManager::~SimpleConstraintManager() {}
 
 bool SimpleConstraintManager::canReasonAbout(SVal X) const {
@@ -296,4 +298,6 @@
   } // end switch
 }
 
-}  // end of namespace clang
+} // end of namespace GR
+
+} // end of namespace clang

Modified: cfe/trunk/lib/GR/SimpleConstraintManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/SimpleConstraintManager.h?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/SimpleConstraintManager.h (original)
+++ cfe/trunk/lib/GR/SimpleConstraintManager.h Wed Dec 22 12:53:20 2010
@@ -11,14 +11,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_SIMPLE_CONSTRAINT_MANAGER_H
-#define LLVM_CLANG_ANALYSIS_SIMPLE_CONSTRAINT_MANAGER_H
+#ifndef LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
+#define LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
 
 #include "clang/GR/PathSensitive/ConstraintManager.h"
 #include "clang/GR/PathSensitive/GRState.h"
 
 namespace clang {
 
+namespace GR {
+
 class SimpleConstraintManager : public ConstraintManager {
   GRSubEngine &SU;
 public:
@@ -84,6 +86,8 @@
   const GRState *assumeAux(const GRState *state, NonLoc Cond, bool Assumption);
 };
 
-}  // end clang namespace
+} // end GR namespace
+
+} // end clang namespace
 
 #endif

Modified: cfe/trunk/lib/GR/SimpleSValBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/SimpleSValBuilder.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/SimpleSValBuilder.cpp (original)
+++ cfe/trunk/lib/GR/SimpleSValBuilder.cpp Wed Dec 22 12:53:20 2010
@@ -15,6 +15,7 @@
 #include "clang/GR/PathSensitive/GRState.h"
 
 using namespace clang;
+using namespace GR;
 
 namespace {
 class SimpleSValBuilder : public SValBuilder {
@@ -46,7 +47,7 @@
 };
 } // end anonymous namespace
 
-SValBuilder *clang::createSimpleSValBuilder(llvm::BumpPtrAllocator &alloc,
+SValBuilder *GR::createSimpleSValBuilder(llvm::BumpPtrAllocator &alloc,
                                             ASTContext &context,
                                             GRStateManager &stateMgr) {
   return new SimpleSValBuilder(alloc, context, stateMgr);

Modified: cfe/trunk/lib/GR/Store.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/Store.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/Store.cpp (original)
+++ cfe/trunk/lib/GR/Store.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/AST/CharUnits.h"
 
 using namespace clang;
+using namespace GR;
 
 StoreManager::StoreManager(GRStateManager &stateMgr)
   : svalBuilder(stateMgr.getSValBuilder()), StateMgr(stateMgr),

Modified: cfe/trunk/lib/GR/SymbolManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/SymbolManager.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/SymbolManager.cpp (original)
+++ cfe/trunk/lib/GR/SymbolManager.cpp Wed Dec 22 12:53:20 2010
@@ -18,6 +18,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
+using namespace GR;
 
 void SymExpr::dump() const {
   dumpToStream(llvm::errs());

Modified: cfe/trunk/lib/GR/TextPathDiagnostics.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/TextPathDiagnostics.cpp?rev=122423&r1=122422&r2=122423&view=diff
==============================================================================
--- cfe/trunk/lib/GR/TextPathDiagnostics.cpp (original)
+++ cfe/trunk/lib/GR/TextPathDiagnostics.cpp Wed Dec 22 12:53:20 2010
@@ -16,6 +16,7 @@
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;
+using namespace GR;
 using namespace llvm;
 
 namespace {
@@ -47,7 +48,7 @@
 } // end anonymous namespace
 
 PathDiagnosticClient*
-clang::createTextPathDiagnosticClient(const std::string& out,
+GR::createTextPathDiagnosticClient(const std::string& out,
                                       const Preprocessor &PP) {
   return new TextPathDiagnostics(out, PP.getDiagnostics());
 }





More information about the cfe-commits mailing list