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

Side by Side Diff: include/AdblockPlus/FilterEngine.h

Issue 10169005: Windows specific changes. All tests passing on Windows. (Closed)
Patch Set: Misscommunication fix Created April 9, 2013, 8:03 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/FilterEngine.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #ifndef ADBLOCKPLUS_FILTER_ENGINE_H 1 #ifndef ADBLOCKPLUS_FILTER_ENGINE_H
2 #define ADBLOCKPLUS_FILTER_ENGINE_H 2 #define ADBLOCKPLUS_FILTER_ENGINE_H
3 3
4 #include <vector> 4 #include <vector>
5 #include <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7 #ifdef _MSC_VER
Felix Dahlke 2013/04/10 07:34:01 I guess my comment got lost since the patch sets s
8 #include <memory>
9 #else
10 #include <tr1/memory>
11 #endif
8 namespace AdblockPlus 12 namespace AdblockPlus
9 { 13 {
10 class JsEngine; 14 class JsEngine;
11 class FilterEngine; 15 class FilterEngine;
12 16
13 class JsObject 17 class JsObject
14 { 18 {
15 public: 19 public:
16 std::string GetProperty(const std::string& name, const std::string& defaultV alue) const; 20 std::string GetProperty(const std::string& name, const std::string& defaultV alue) const;
17 int GetProperty(const std::string& name, int defaultValue) const; 21 int GetProperty(const std::string& name, int defaultValue) const;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #if FILTER_ENGINE_STUBS 112 #if FILTER_ENGINE_STUBS
109 std::map<std::string, FilterPtr> knownFilters; 113 std::map<std::string, FilterPtr> knownFilters;
110 std::vector<FilterPtr> listedFilters; 114 std::vector<FilterPtr> listedFilters;
111 std::map<std::string, SubscriptionPtr> knownSubscriptions; 115 std::map<std::string, SubscriptionPtr> knownSubscriptions;
112 std::vector<SubscriptionPtr> listedSubscriptions; 116 std::vector<SubscriptionPtr> listedSubscriptions;
113 #endif 117 #endif
114 }; 118 };
115 } 119 }
116 120
117 #endif 121 #endif
OLDNEW
« no previous file with comments | « no previous file | src/FilterEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld