Left: | ||
Right: |
OLD | NEW |
---|---|
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 #ifdef _WIN32 || _WIN64 | |
Felix Dahlke
2013/04/09 08:11:15
Why not just "#ifdef WIN32"? That's what I always
| |
8 #include <memory> | |
9 #include <cctype> | |
10 #include <functional> | |
Felix Dahlke
2013/04/09 08:11:15
Is cctype and functional really needed in the head
| |
11 #else | |
12 #include <tr1/memory> | |
13 #endif | |
14 | 7 |
15 namespace AdblockPlus | 8 namespace AdblockPlus |
16 { | 9 { |
17 class JsEngine; | 10 class JsEngine; |
18 class FilterEngine; | 11 class FilterEngine; |
19 | 12 |
20 class JsObject | 13 class JsObject |
21 { | 14 { |
22 public: | 15 public: |
23 std::string GetProperty(const std::string& name, const std::string& defaultV alue) const; | 16 std::string GetProperty(const std::string& name, const std::string& defaultV alue) const; |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
115 #if FILTER_ENGINE_STUBS | 108 #if FILTER_ENGINE_STUBS |
116 std::map<std::string, FilterPtr> knownFilters; | 109 std::map<std::string, FilterPtr> knownFilters; |
117 std::vector<FilterPtr> listedFilters; | 110 std::vector<FilterPtr> listedFilters; |
118 std::map<std::string, SubscriptionPtr> knownSubscriptions; | 111 std::map<std::string, SubscriptionPtr> knownSubscriptions; |
119 std::vector<SubscriptionPtr> listedSubscriptions; | 112 std::vector<SubscriptionPtr> listedSubscriptions; |
120 #endif | 113 #endif |
121 }; | 114 }; |
122 } | 115 } |
123 | 116 |
124 #endif | 117 #endif |
OLD | NEW |