include/AdblockPlus/FilterEngine.h - Issue 10169005: Windows specific changes. All tests passing on Windows.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Delta Between Two Patch Sets: include/AdblockPlus/FilterEngine.h

Issue 10169005: Windows specific changes. All tests passing on Windows. (Closed)

Left Patch Set: Misscommunication fix Created April 9, 2013, 8:03 a.m.

Right 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:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
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
Felix Dahlke 2013/04/10 07:34:01 I guess my comment got lost since the patch sets s I guess my comment got lost since the patch sets seem to be off, but this should be "#ifdef WIN32". Works fine on Windows 64 and also in compilers other than MSVC.
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 Loading...
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

LEFT	RIGHT