diff --git a/include/clang/Analysis/Analyses/ThreadSafetyTIL.h b/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
index 1d9f25259add981d9f6d3e5d566708ccda7dee98..05eb21ebafd35f1fcb52f3075266af84237110db 100644
--- a/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
+++ b/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
@@ -264,12 +264,12 @@ private:
 
 
 // Contains various helper functions for SExprs.
-namespace ThreadSafetyTIL {
-static bool isTrivial(SExpr *E) {
-  unsigned Op = E->opcode();
-  return Op == COP_Variable || Op == COP_Literal || Op == COP_LiteralPtr;
-}
-}
+struct ThreadSafetyTIL {
+  static bool isTrivial(SExpr *E) {
+    unsigned Op = E->opcode();
+    return Op == COP_Variable || Op == COP_Literal || Op == COP_LiteralPtr;
+  }
+};
 
 class Function;
 class SFunction;