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

Unified Diff: include/AdblockPlus/Notification.h

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: rebase Created Aug. 5, 2015, 10:38 a.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: include/AdblockPlus/Notification.h
diff --git a/include/AdblockPlus/Notification.h b/include/AdblockPlus/Notification.h
index 57b1ff0e33e28fbf73b6d72b5e08c29a4ae19e18..fb5745f4ac2a1ef1aeb11cf4a5af252f314ddb3b 100644
--- a/include/AdblockPlus/Notification.h
+++ b/include/AdblockPlus/Notification.h
@@ -20,7 +20,6 @@
#include <string>
#include <vector>
-#include "tr1_memory.h"
Wladimir Palant 2015/08/05 11:19:40 You are assuming that <vector> will include <memor
sergei 2015/08/06 07:35:30 Here the same, <memory> is not included by <vector
Wladimir Palant 2015/08/06 12:24:54 Ok, that's even worse then - very non-obvious and
sergei 2015/08/07 06:29:39 Yes, sure.
namespace AdblockPlus
{
@@ -42,7 +41,7 @@ namespace AdblockPlus
{
friend class FilterEngine;
protected:
- static std::tr1::shared_ptr<Notification> JsValueToNotification(const JsValuePtr& jsValue);
+ static std::shared_ptr<Notification> JsValueToNotification(const JsValuePtr& jsValue);
/**
* Constructor.
* @param jsValue `JsValuePtr` notification JavaScript object.
@@ -83,7 +82,7 @@ namespace AdblockPlus
std::string message;
NotificationType type;
};
- typedef std::tr1::shared_ptr<Notification> NotificationPtr;
+ typedef std::shared_ptr<Notification> NotificationPtr;
}
#endif

Powered by Google App Engine
This is Rietveld