aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/Analysis/DomainSpecific/CocoaConventions.h (renamed from include/clang/Checker/DomainSpecific/CocoaConventions.h)4
-rw-r--r--lib/Analysis/CMakeLists.txt1
-rw-r--r--lib/Analysis/CocoaConventions.cpp (renamed from lib/Checker/CocoaConventions.cpp)2
-rw-r--r--lib/Checker/CFRefCount.cpp2
-rw-r--r--lib/Checker/CMakeLists.txt1
5 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Checker/DomainSpecific/CocoaConventions.h b/include/clang/Analysis/DomainSpecific/CocoaConventions.h
index 4bbdab0e7f..81b71a7bdc 100644
--- a/include/clang/Checker/DomainSpecific/CocoaConventions.h
+++ b/include/clang/Analysis/DomainSpecific/CocoaConventions.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_CHECKER_DS_COCOA
-#define LLVM_CLANG_CHECKER_DS_COCOA
+#ifndef LLVM_CLANG_ANALYSIS_DS_COCOA
+#define LLVM_CLANG_ANALYSIS_DS_COCOA
#include "clang/AST/Type.h"
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index a2cfcfc4fa..1709f6d6b7 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -6,6 +6,7 @@ add_clang_library(clangAnalysis
AnalysisContext.cpp
CFG.cpp
CFGStmtMap.cpp
+ CocoaConventions.cpp
FormatString.cpp
LiveVariables.cpp
PrintfFormatString.cpp
diff --git a/lib/Checker/CocoaConventions.cpp b/lib/Analysis/CocoaConventions.cpp
index 8a3abc8bae..9a1be3ee05 100644
--- a/lib/Checker/CocoaConventions.cpp
+++ b/lib/Analysis/CocoaConventions.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/DomainSpecific/CocoaConventions.h"
+#include "clang/Analysis/DomainSpecific/CocoaConventions.h"
#include "clang/AST/Type.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/Checker/CFRefCount.cpp b/lib/Checker/CFRefCount.cpp
index d9900c5dfb..5715e34e7e 100644
--- a/lib/Checker/CFRefCount.cpp
+++ b/lib/Checker/CFRefCount.cpp
@@ -19,7 +19,7 @@
#include "clang/Checker/BugReporter/BugType.h"
#include "clang/Checker/BugReporter/PathDiagnostic.h"
#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/DomainSpecific/CocoaConventions.h"
+#include "clang/Analysis/DomainSpecific/CocoaConventions.h"
#include "clang/Checker/PathSensitive/CheckerVisitor.h"
#include "clang/Checker/PathSensitive/GRExprEngineBuilders.h"
#include "clang/Checker/PathSensitive/GRStateTrait.h"
diff --git a/lib/Checker/CMakeLists.txt b/lib/Checker/CMakeLists.txt
index 24383662f3..c6b4550b73 100644
--- a/lib/Checker/CMakeLists.txt
+++ b/lib/Checker/CMakeLists.txt
@@ -30,7 +30,6 @@ add_clang_library(clangChecker
Checker.cpp
CheckerHelpers.cpp
ChrootChecker.cpp
- CocoaConventions.cpp
DereferenceChecker.cpp
DivZeroChecker.cpp
Environment.cpp