RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 04:09:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix auto_ptr is deprecated warnings

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176123 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matt Arsenault 2013-02-26 21:20:35 +00:00
parent 6fe26103d7
commit 7375f4f981
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Archive/ArchiveReader.cpp
View File

@ -13,13 +13,13 @@
#include "llvm/Bitcode/Archive.h"
#include "ArchiveInternals.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/MemoryBuffer.h"
#include <cstdio>
#include <cstdlib>
#include <memory>
using namespace llvm;
/// Read a variable-bit-rate encoded unsigned integer
@ -326,14 +326,14 @@ Archive::loadArchive(std::string* error) {
// Open and completely load the archive file.
Archive*
Archive::OpenAndLoad(const sys::Path& file, LLVMContext& C,
Archive::OpenAndLoad(const sys::Path& File, LLVMContext& C,
std::string* ErrorMessage) {
std::auto_ptr<Archive> result ( new Archive(file, C));
OwningPtr<Archive> result ( new Archive(File, C));
if (result->mapToMemory(ErrorMessage))
return 0;
return NULL;
if (!result->loadArchive(ErrorMessage))
return 0;
return result.release();
return NULL;
return result.take();
}
// Get all the bitcode modules from the archive
@ -440,15 +440,15 @@ Archive::loadSymbolTable(std::string* ErrorMsg) {
}
// Open the archive and load just the symbol tables
Archive* Archive::OpenAndLoadSymbols(const sys::Path& file,
Archive* Archive::OpenAndLoadSymbols(const sys::Path& File,
LLVMContext& C,
std::string* ErrorMessage) {
std::auto_ptr<Archive> result ( new Archive(file, C) );
OwningPtr<Archive> result ( new Archive(File, C) );
if (result->mapToMemory(ErrorMessage))
return 0;
return NULL;
if (!result->loadSymbolTable(ErrorMessage))
return 0;
return result.release();
return NULL;
return result.take();
}
// Look up one symbol in the symbol table and return the module that defines

22
tools/llvm-stress/llvm-stress.cpp
View File

@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//
#include "llvm/IR/LLVMContext.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Analysis/CallGraphSCCPass.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/Assembly/PrintModulePass.h"
@ -26,7 +27,6 @@
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/ToolOutputFile.h"
#include <algorithm>
#include <memory>
#include <set>
#include <sstream>
#include <vector>
@ -622,15 +622,15 @@ void FillFunction(Function *F, Random &R) {
// List of modifiers which add new random instructions.
std::vector<Modifier*> Modifiers;
std::auto_ptr<Modifier> LM(new LoadModifier(BB, &PT, &R));
std::auto_ptr<Modifier> SM(new StoreModifier(BB, &PT, &R));
std::auto_ptr<Modifier> EE(new ExtractElementModifier(BB, &PT, &R));
std::auto_ptr<Modifier> SHM(new ShuffModifier(BB, &PT, &R));
std::auto_ptr<Modifier> IE(new InsertElementModifier(BB, &PT, &R));
std::auto_ptr<Modifier> BM(new BinModifier(BB, &PT, &R));
std::auto_ptr<Modifier> CM(new CastModifier(BB, &PT, &R));
std::auto_ptr<Modifier> SLM(new SelectModifier(BB, &PT, &R));
std::auto_ptr<Modifier> PM(new CmpModifier(BB, &PT, &R));
OwningPtr<Modifier> LM(new LoadModifier(BB, &PT, &R));
OwningPtr<Modifier> SM(new StoreModifier(BB, &PT, &R));
OwningPtr<Modifier> EE(new ExtractElementModifier(BB, &PT, &R));
OwningPtr<Modifier> SHM(new ShuffModifier(BB, &PT, &R));
OwningPtr<Modifier> IE(new InsertElementModifier(BB, &PT, &R));
OwningPtr<Modifier> BM(new BinModifier(BB, &PT, &R));
OwningPtr<Modifier> CM(new CastModifier(BB, &PT, &R));
OwningPtr<Modifier> SLM(new SelectModifier(BB, &PT, &R));
OwningPtr<Modifier> PM(new CmpModifier(BB, &PT, &R));
Modifiers.push_back(LM.get());
Modifiers.push_back(SM.get());
Modifiers.push_back(EE.get());
@ -684,7 +684,7 @@ int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, "llvm codegen stress-tester\n");
llvm_shutdown_obj Y;
std::auto_ptr<Module> M(new Module("/tmp/autogen.bc", getGlobalContext()));
OwningPtr<Module> M(new Module("/tmp/autogen.bc", getGlobalContext()));
Function *F = GenEmptyFunction(M.get());
// Pick an initial seed value