1 files changed, 7 insertions, 2 deletions
diff --git a/clang/include/clang/GR/PathSensitive/SValBuilder.h b/clang/include/clang/GR/PathSensitive/SValBuilder.h
index 1b5fac3db21..2869a2ff5b8 100644
--- a/clang/include/clang/GR/PathSensitive/SValBuilder.h
+++ b/clang/include/clang/GR/PathSensitive/SValBuilder.h
@@ -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 @@ SValBuilder* createSimpleSValBuilder(llvm::BumpPtrAllocator &alloc,
                                      ASTContext &context,
                                      GRStateManager &stateMgr);
 
+} // end GR namespace
+
 } // end clang namespace
+
 #endif