Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit f8b74ee

Browse files
committed
[C++11] Replace OwningPtr include with <memory>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203389 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent facff14 commit f8b74ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+58
-58
lines changed

examples/clang-interpreter/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "clang/Frontend/CompilerInvocation.h"
1717
#include "clang/Frontend/FrontendDiagnostic.h"
1818
#include "clang/Frontend/TextDiagnosticPrinter.h"
19-
#include "llvm/ADT/OwningPtr.h"
2019
#include "llvm/ADT/SmallString.h"
2120
#include "llvm/ExecutionEngine/ExecutionEngine.h"
2221
#include "llvm/ExecutionEngine/JIT.h"
@@ -27,6 +26,7 @@
2726
#include "llvm/Support/Path.h"
2827
#include "llvm/Support/TargetSelect.h"
2928
#include "llvm/Support/raw_ostream.h"
29+
#include <memory>
3030
using namespace clang;
3131
using namespace clang::driver;
3232

include/clang/ARCMigrate/ARCMTActions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "clang/ARCMigrate/FileRemapper.h"
1414
#include "clang/Frontend/FrontendAction.h"
15-
#include "llvm/ADT/OwningPtr.h"
15+
#include <memory>
1616

1717
namespace clang {
1818
namespace arcmt {

include/clang/AST/ASTContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
#include "llvm/ADT/DenseMap.h"
3434
#include "llvm/ADT/FoldingSet.h"
3535
#include "llvm/ADT/IntrusiveRefCntPtr.h"
36-
#include "llvm/ADT/OwningPtr.h"
3736
#include "llvm/ADT/SmallPtrSet.h"
3837
#include "llvm/ADT/TinyPtrVector.h"
3938
#include "llvm/Support/Allocator.h"
39+
#include <memory>
4040
#include <vector>
4141

4242
namespace llvm {

include/clang/AST/VTableBuilder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "clang/AST/RecordLayout.h"
2121
#include "clang/Basic/ABI.h"
2222
#include "llvm/ADT/DenseMap.h"
23-
#include "llvm/ADT/OwningPtr.h"
2423
#include "llvm/ADT/SetVector.h"
24+
#include <memory>
2525
#include <utility>
2626

2727
namespace clang {

include/clang/ASTMatchers/Dynamic/VariantValue.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "clang/ASTMatchers/ASTMatchersInternal.h"
2222
#include "llvm/ADT/IntrusiveRefCntPtr.h"
2323
#include "llvm/ADT/Optional.h"
24-
#include "llvm/ADT/OwningPtr.h"
2524
#include "llvm/ADT/Twine.h"
25+
#include <memory>
2626
#include <vector>
2727

2828
namespace clang {

include/clang/Analysis/AnalysisContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "clang/Analysis/CFG.h"
2020
#include "llvm/ADT/DenseMap.h"
2121
#include "llvm/ADT/FoldingSet.h"
22-
#include "llvm/ADT/OwningPtr.h"
2322
#include "llvm/Support/Allocator.h"
23+
#include <memory>
2424

2525
namespace clang {
2626

include/clang/Analysis/CFG.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
#include "llvm/ADT/DenseMap.h"
2222
#include "llvm/ADT/GraphTraits.h"
2323
#include "llvm/ADT/Optional.h"
24-
#include "llvm/ADT/OwningPtr.h"
2524
#include "llvm/ADT/PointerIntPair.h"
2625
#include "llvm/Support/Allocator.h"
2726
#include "llvm/Support/Casting.h"
2827
#include "llvm/Support/raw_ostream.h"
2928
#include <bitset>
3029
#include <cassert>
3130
#include <iterator>
31+
#include <memory>
3232

3333
namespace clang {
3434
class CXXDestructorDecl;

include/clang/Basic/FileManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include "clang/Basic/VirtualFileSystem.h"
2121
#include "llvm/ADT/DenseMap.h"
2222
#include "llvm/ADT/IntrusiveRefCntPtr.h"
23-
#include "llvm/ADT/OwningPtr.h"
2423
#include "llvm/ADT/SmallVector.h"
2524
#include "llvm/ADT/StringMap.h"
2625
#include "llvm/ADT/StringRef.h"
2726
#include "llvm/Support/Allocator.h"
27+
#include <memory>
2828
// FIXME: Enhance libsystem to support inode and other fields in stat.
2929
#include <sys/types.h>
3030
#include <map>

include/clang/Basic/FileSystemStatCache.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#define LLVM_CLANG_FILESYSTEMSTATCACHE_H
1717

1818
#include "clang/Basic/LLVM.h"
19-
#include "llvm/ADT/OwningPtr.h"
2019
#include "llvm/ADT/StringMap.h"
2120
#include "llvm/Support/FileSystem.h"
21+
#include <memory>
2222
#include <sys/stat.h>
2323
#include <sys/types.h>
2424

include/clang/Basic/SourceManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
#include "llvm/ADT/DenseMap.h"
4343
#include "llvm/ADT/DenseSet.h"
4444
#include "llvm/ADT/IntrusiveRefCntPtr.h"
45-
#include "llvm/ADT/OwningPtr.h"
4645
#include "llvm/ADT/PointerIntPair.h"
4746
#include "llvm/ADT/PointerUnion.h"
4847
#include "llvm/Support/Allocator.h"
4948
#include "llvm/Support/DataTypes.h"
5049
#include "llvm/Support/MemoryBuffer.h"
5150
#include <cassert>
5251
#include <map>
52+
#include <memory>
5353
#include <vector>
5454

5555
namespace clang {

include/clang/CodeGen/CodeGenAction.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define LLVM_CLANG_CODEGEN_CODE_GEN_ACTION_H
1212

1313
#include "clang/Frontend/FrontendAction.h"
14-
#include "llvm/ADT/OwningPtr.h"
14+
#include <memory>
1515

1616
namespace llvm {
1717
class LLVMContext;

include/clang/Driver/Driver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#include "clang/Driver/Phases.h"
1616
#include "clang/Driver/Types.h"
1717
#include "clang/Driver/Util.h"
18-
#include "llvm/ADT/OwningPtr.h"
1918
#include "llvm/ADT/StringMap.h"
2019
#include "llvm/ADT/StringRef.h"
2120
#include "llvm/ADT/Triple.h"
2221
#include "llvm/Support/Path.h" // FIXME: Kill when CompilationInfo
22+
#include <memory>
2323
// lands.
2424
#include <list>
2525
#include <set>

include/clang/Driver/Job.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#define CLANG_DRIVER_JOB_H_
1212

1313
#include "clang/Basic/LLVM.h"
14-
#include "llvm/ADT/OwningPtr.h"
1514
#include "llvm/ADT/SmallVector.h"
1615
#include "llvm/Option/Option.h"
16+
#include <memory>
1717

1818
namespace llvm {
1919
class raw_ostream;

include/clang/Driver/ToolChain.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include "clang/Driver/Multilib.h"
1515
#include "clang/Driver/Types.h"
1616
#include "clang/Driver/Util.h"
17-
#include "llvm/ADT/OwningPtr.h"
1817
#include "llvm/ADT/SmallVector.h"
1918
#include "llvm/ADT/Triple.h"
2019
#include "llvm/Support/Path.h"
20+
#include <memory>
2121
#include <string>
2222

2323
namespace llvm {

include/clang/Frontend/ASTUnit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
#include "clang/Sema/CodeCompleteConsumer.h"
2828
#include "clang/Serialization/ASTBitCodes.h"
2929
#include "llvm/ADT/IntrusiveRefCntPtr.h"
30-
#include "llvm/ADT/OwningPtr.h"
3130
#include "llvm/ADT/SmallVector.h"
3231
#include "llvm/ADT/StringMap.h"
3332
#include "llvm/Support/MD5.h"
3433
#include "llvm/Support/Path.h"
3534
#include <cassert>
3635
#include <map>
36+
#include <memory>
3737
#include <string>
3838
#include <sys/types.h>
3939
#include <utility>

include/clang/Frontend/ChainedDiagnosticConsumer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define LLVM_CLANG_FRONTEND_CHAINEDDIAGNOSTICCONSUMER_H
1212

1313
#include "clang/Basic/Diagnostic.h"
14-
#include "llvm/ADT/OwningPtr.h"
14+
#include <memory>
1515

1616
namespace clang {
1717
class LangOptions;

include/clang/Frontend/CompilerInstance.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include "llvm/ADT/ArrayRef.h"
1919
#include "llvm/ADT/DenseMap.h"
2020
#include "llvm/ADT/IntrusiveRefCntPtr.h"
21-
#include "llvm/ADT/OwningPtr.h"
2221
#include "llvm/ADT/StringRef.h"
2322
#include <cassert>
2423
#include <list>
24+
#include <memory>
2525
#include <string>
2626
#include <utility>
2727

include/clang/Frontend/FrontendAction.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "clang/Basic/LLVM.h"
2222
#include "clang/Basic/LangOptions.h"
2323
#include "clang/Frontend/FrontendOptions.h"
24-
#include "llvm/ADT/OwningPtr.h"
2524
#include "llvm/ADT/StringRef.h"
25+
#include <memory>
2626
#include <string>
2727
#include <vector>
2828

include/clang/Frontend/TextDiagnosticPrinter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "clang/Basic/Diagnostic.h"
1919
#include "clang/Basic/LLVM.h"
2020
#include "llvm/ADT/IntrusiveRefCntPtr.h"
21-
#include "llvm/ADT/OwningPtr.h"
21+
#include <memory>
2222

2323
namespace clang {
2424
class DiagnosticOptions;

include/clang/Frontend/VerifyDiagnosticConsumer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#include "clang/Basic/Diagnostic.h"
1414
#include "clang/Lex/Preprocessor.h"
1515
#include "llvm/ADT/DenseMap.h"
16-
#include "llvm/ADT/OwningPtr.h"
1716
#include "llvm/ADT/PointerIntPair.h"
1817
#include "llvm/ADT/STLExtras.h"
1918
#include <climits>
19+
#include <memory>
2020

2121
namespace clang {
2222

include/clang/Lex/HeaderSearch.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include "clang/Lex/ModuleMap.h"
1919
#include "llvm/ADT/ArrayRef.h"
2020
#include "llvm/ADT/IntrusiveRefCntPtr.h"
21-
#include "llvm/ADT/OwningPtr.h"
2221
#include "llvm/ADT/StringMap.h"
2322
#include "llvm/ADT/StringSet.h"
2423
#include "llvm/Support/Allocator.h"
24+
#include <memory>
2525
#include <vector>
2626

2727
namespace clang {

include/clang/Lex/Preprocessor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
#include "llvm/ADT/ArrayRef.h"
3030
#include "llvm/ADT/DenseMap.h"
3131
#include "llvm/ADT/IntrusiveRefCntPtr.h"
32-
#include "llvm/ADT/OwningPtr.h"
3332
#include "llvm/ADT/SmallPtrSet.h"
3433
#include "llvm/ADT/SmallVector.h"
3534
#include "llvm/Support/Allocator.h"
35+
#include <memory>
3636
#include <vector>
3737

3838
namespace llvm {

include/clang/Parse/Parser.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
#include "clang/Lex/Preprocessor.h"
2222
#include "clang/Sema/DeclSpec.h"
2323
#include "clang/Sema/Sema.h"
24-
#include "llvm/ADT/OwningPtr.h"
2524
#include "llvm/ADT/SmallVector.h"
2625
#include "llvm/Support/Compiler.h"
2726
#include "llvm/Support/PrettyStackTrace.h"
2827
#include "llvm/Support/SaveAndRestore.h"
28+
#include <memory>
2929
#include <stack>
3030

3131
namespace clang {

include/clang/Sema/Sema.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
#include "clang/Sema/Weak.h"
4545
#include "llvm/ADT/ArrayRef.h"
4646
#include "llvm/ADT/Optional.h"
47-
#include "llvm/ADT/OwningPtr.h"
4847
#include "llvm/ADT/SetVector.h"
4948
#include "llvm/ADT/SmallPtrSet.h"
5049
#include "llvm/ADT/SmallVector.h"
5150
#include "llvm/MC/MCParser/MCAsmParser.h"
5251
#include <deque>
52+
#include <memory>
5353
#include <string>
5454
#include <vector>
5555

include/clang/Serialization/ASTReader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "llvm/ADT/APSInt.h"
3737
#include "llvm/ADT/DenseSet.h"
3838
#include "llvm/ADT/MapVector.h"
39-
#include "llvm/ADT/OwningPtr.h"
4039
#include "llvm/ADT/SmallPtrSet.h"
4140
#include "llvm/ADT/SmallSet.h"
4241
#include "llvm/ADT/SmallVector.h"
@@ -45,6 +44,7 @@
4544
#include "llvm/Support/DataTypes.h"
4645
#include <deque>
4746
#include <map>
47+
#include <memory>
4848
#include <string>
4949
#include <sys/stat.h>
5050
#include <utility>

include/clang/Serialization/GlobalModuleIndex.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#define LLVM_CLANG_SERIALIZATION_GLOBAL_MODULE_INDEX_H
1818

1919
#include "llvm/ADT/DenseMap.h"
20-
#include "llvm/ADT/OwningPtr.h"
2120
#include "llvm/ADT/SmallPtrSet.h"
2221
#include "llvm/ADT/SmallVector.h"
2322
#include "llvm/ADT/StringMap.h"
2423
#include "llvm/ADT/StringRef.h"
24+
#include <memory>
2525
#include <utility>
2626

2727
namespace llvm {

include/clang/Serialization/Module.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "clang/Basic/SourceLocation.h"
1919
#include "clang/Serialization/ASTBitCodes.h"
2020
#include "clang/Serialization/ContinuousRangeMap.h"
21-
#include "llvm/ADT/OwningPtr.h"
2221
#include "llvm/ADT/SetVector.h"
2322
#include "llvm/Bitcode/BitstreamReader.h"
23+
#include <memory>
2424
#include <string>
2525

2626
namespace clang {

include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h"
2222
#include "clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h"
2323
#include "clang/StaticAnalyzer/Core/PathSensitive/WorkList.h"
24-
#include "llvm/ADT/OwningPtr.h"
24+
#include <memory>
2525

2626
namespace clang {
2727

include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
#include "llvm/ADT/DepthFirstIterator.h"
2828
#include "llvm/ADT/FoldingSet.h"
2929
#include "llvm/ADT/GraphTraits.h"
30-
#include "llvm/ADT/OwningPtr.h"
3130
#include "llvm/ADT/SmallPtrSet.h"
3231
#include "llvm/ADT/SmallVector.h"
3332
#include "llvm/Support/Allocator.h"
3433
#include "llvm/Support/Casting.h"
34+
#include <memory>
3535
#include <vector>
3636

3737
namespace clang {

include/clang/Tooling/CompilationDatabase.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
#include "clang/Basic/LLVM.h"
3232
#include "llvm/ADT/ArrayRef.h"
33-
#include "llvm/ADT/OwningPtr.h"
3433
#include "llvm/ADT/StringRef.h"
3534
#include "llvm/ADT/Twine.h"
35+
#include <memory>
3636
#include <string>
3737
#include <vector>
3838

include/clang/Tooling/JSONCompilationDatabase.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
#include "clang/Basic/LLVM.h"
1919
#include "clang/Tooling/CompilationDatabase.h"
2020
#include "clang/Tooling/FileMatchTrie.h"
21-
#include "llvm/ADT/OwningPtr.h"
2221
#include "llvm/ADT/StringMap.h"
2322
#include "llvm/ADT/StringRef.h"
2423
#include "llvm/Support/MemoryBuffer.h"
2524
#include "llvm/Support/SourceMgr.h"
2625
#include "llvm/Support/YAMLParser.h"
26+
#include <memory>
2727
#include <string>
2828
#include <vector>
2929

lib/Analysis/CFG.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "clang/AST/StmtVisitor.h"
2222
#include "clang/Basic/Builtins.h"
2323
#include "llvm/ADT/DenseMap.h"
24-
#include "llvm/ADT/OwningPtr.h"
24+
#include <memory>
2525
#include "llvm/ADT/SmallPtrSet.h"
2626
#include "llvm/Support/Allocator.h"
2727
#include "llvm/Support/Format.h"

lib/Analysis/Consumed.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "clang/Basic/OperatorKinds.h"
2828
#include "clang/Basic/SourceLocation.h"
2929
#include "llvm/ADT/DenseMap.h"
30-
#include "llvm/ADT/OwningPtr.h"
3130
#include "llvm/ADT/SmallVector.h"
3231
#include "llvm/Support/Compiler.h"
3332
#include "llvm/Support/raw_ostream.h"
33+
#include <memory>
3434

3535
// TODO: Adjust states of args to constructors in the same way that arguments to
3636
// function calls are handled.

0 commit comments

Comments
 (0)