Replace std::tr1::shared_ptr by std::shared_ptr.
This patch replaces C++ Technical Report 1 additions to C++03 with
the newer C++11 name.
Includes and using statements updated accordingly.
BUG=None
TEST=Build and unittests.
Change-Id: I9bdad6d39684545c786f5c76fb598a15b557d6eb
Reviewed-on: https://chromium-review.googlesource.com/200665
Tested-by: Alex Deymo <[email protected]>
Reviewed-by: David Zeuthen <[email protected]>
Commit-Queue: Alex Deymo <[email protected]>
diff --git a/action.h b/action.h
index 7ac4a13..27a2297 100644
--- a/action.h
+++ b/action.h
@@ -6,12 +6,15 @@
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_ACTION_H_
#include <stdio.h>
-#include <tr1/memory>
+
#include <iostream>
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "update_engine/action_processor.h"
+#include <memory>
+
+#include <base/basictypes.h>
+#include <base/logging.h>
+
#include "update_engine/action_pipe.h"
+#include "update_engine/action_processor.h"
// The structure of these classes (Action, ActionPipe, ActionProcessor, etc.)
// is based on the KSAction* classes from the Google Update Engine code at
@@ -137,7 +140,7 @@
void set_in_pipe(
// this type is a fancy way of saying: a shared_ptr to an
// ActionPipe<InputObjectType>.
- const std::tr1::shared_ptr<ActionPipe<
+ const std::shared_ptr<ActionPipe<
typename ActionTraits<SubClass>::InputObjectType> >&
in_pipe) {
in_pipe_ = in_pipe;
@@ -150,7 +153,7 @@
void set_out_pipe(
// this type is a fancy way of saying: a shared_ptr to an
// ActionPipe<OutputObjectType>.
- const std::tr1::shared_ptr<ActionPipe<
+ const std::shared_ptr<ActionPipe<
typename ActionTraits<SubClass>::OutputObjectType> >&
out_pipe) {
out_pipe_ = out_pipe;
@@ -193,10 +196,10 @@
// point to when the last such shared_ptr object dies. We consider the
// Actions on either end of a pipe to "own" the pipe. When the last Action
// of the two dies, the ActionPipe will die, too.
- std::tr1::shared_ptr<
+ std::shared_ptr<
ActionPipe<typename ActionTraits<SubClass>::InputObjectType> >
in_pipe_;
- std::tr1::shared_ptr<
+ std::shared_ptr<
ActionPipe<typename ActionTraits<SubClass>::OutputObjectType> >
out_pipe_;
};
