Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/FileSystemJsObject.cpp

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: Created July 11, 2014, 2:24 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: test/FileSystemJsObject.cpp
===================================================================
--- a/test/FileSystemJsObject.cpp
+++ b/test/FileSystemJsObject.cpp
@@ -36,26 +36,26 @@ namespace
bool statIsDirectory;
bool statIsFile;
int statLastModified;
MockFileSystem() : success(true)
{
}
- std::tr1::shared_ptr<std::istream> Read(const std::string& path) const
+ std::shared_ptr<std::istream> Read(const std::string& path) const
{
if (!success)
throw std::runtime_error("Unable to read " + path);
std::stringstream* const stream = new std::stringstream;
*stream << contentToRead;
- return std::tr1::shared_ptr<std::istream>(stream);
+ return std::shared_ptr<std::istream>(stream);
}
- void Write(const std::string& path, std::tr1::shared_ptr<std::istream> data)
+ void Write(const std::string& path, std::shared_ptr<std::istream> data)
{
if (!success)
throw std::runtime_error("Unable to write to " + path);
lastWrittenPath = path;
std::stringstream content;
content << data->rdbuf();
lastWrittenContent = content.str();
@@ -102,17 +102,17 @@ namespace
std::string& error)
{
jsEngine->Evaluate("_fileSystem.read('', function(r) {result = r})");
AdblockPlus::Sleep(50);
content = jsEngine->Evaluate("result.content")->AsString();
error = jsEngine->Evaluate("result.error")->AsString();
}
- typedef std::tr1::shared_ptr<MockFileSystem> MockFileSystemPtr;
+ typedef std::shared_ptr<MockFileSystem> MockFileSystemPtr;
class FileSystemJsObjectTest : public BaseJsTest
{
protected:
MockFileSystemPtr mockFileSystem;
void SetUp()
{

Powered by Google App Engine
This is Rietveld