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: Comments address. WIN32 in #ifdef and whitespace Created April 10, 2013, 7:55 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 | « MSVS/tests.vcxproj ('k') | src/GlobalJsObject.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 #ifdef _MSC_VER 7 #ifdef WIN32
8 #include <memory> 8 #include <memory>
9 #else 9 #else
10 #include <tr1/memory> 10 #include <tr1/memory>
11 #endif 11 #endif
12 namespace AdblockPlus 12 namespace AdblockPlus
13 { 13 {
14 class JsEngine; 14 class JsEngine;
15 class FilterEngine; 15 class FilterEngine;
16 16
17 class JsObject 17 class JsObject
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 #if FILTER_ENGINE_STUBS 112 #if FILTER_ENGINE_STUBS
113 std::map<std::string, FilterPtr> knownFilters; 113 std::map<std::string, FilterPtr> knownFilters;
114 std::vector<FilterPtr> listedFilters; 114 std::vector<FilterPtr> listedFilters;
115 std::map<std::string, SubscriptionPtr> knownSubscriptions; 115 std::map<std::string, SubscriptionPtr> knownSubscriptions;
116 std::vector<SubscriptionPtr> listedSubscriptions; 116 std::vector<SubscriptionPtr> listedSubscriptions;
117 #endif 117 #endif
118 }; 118 };
119 } 119 }
120 120
121 #endif 121 #endif
OLDNEW
« no previous file with comments | « MSVS/tests.vcxproj ('k') | src/GlobalJsObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld