src/FilterEngine.cpp - Issue 10169005: Windows specific changes. All tests passing on Windows.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

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

Side by Side Diff: src/FilterEngine.cpp

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

Patch Set: Previous patch comments addressed Created April 9, 2013, 7:38 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

OLD	NEW
1 #include <algorithm>	1 #include <algorithm>

	2 #include <memory>
	Wladimir Palant 2013/04/09 08:00:10 Miscommunication here apparently - #include <memor Miscommunication here apparently - #include <memory> is actually needed in the header file and that one needs #if defined(_MSC_VER) (still #include <tr1/memory> for gcc). Only cctype and functional should be included here. Felix Dahlke 2013/04/09 08:11:15 Like I said in the header, "#ifdef WIN32" should w Show quoted text On 2013/04/09 08:00:10, Wladimir Palant wrote: > Miscommunication here apparently - #include <memory> is actually needed in the > header file and that one needs #if defined(_MSC_VER) (still #include > <tr1/memory> for gcc). Only cctype and functional should be included here. Like I said in the header, "#ifdef WIN32" should work fine.
	3 #include <cctype>

	4 #include <functional>

	5

2 #include <AdblockPlus.h>	6 #include <AdblockPlus.h>

3	7

4 using namespace AdblockPlus;	8 using namespace AdblockPlus;

5	9

6 #if !FILTER_ENGINE_STUBS	10 #if !FILTER_ENGINE_STUBS

7 extern const char* jsSources[];	11 extern const char* jsSources[];

8 #endif	12 #endif

9	13

10 #if FILTER_ENGINE_STUBS	14 #if FILTER_ENGINE_STUBS

11 JsObject::JsObject(FilterEngine& filterEngine)	15 JsObject::JsObject(FilterEngine& filterEngine)

(...skipping 254 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
266 #if FILTER_ENGINE_STUBS	270 #if FILTER_ENGINE_STUBS

267 std::vector<std::string> selectors;	271 std::vector<std::string> selectors;

268 selectors.push_back("#ad");	272 selectors.push_back("#ad");

269 selectors.push_back(".ad");	273 selectors.push_back(".ad");

270 //For test on http://simple-adblock.com/faq/testing-your-adblocker/	274 //For test on http://simple-adblock.com/faq/testing-your-adblocker/

271 if (domain == "simple-adblock.com")	275 if (domain == "simple-adblock.com")

272 selectors.push_back(".ad_300x250");	276 selectors.push_back(".ad_300x250");

273 return selectors;	277 return selectors;

274 #endif	278 #endif

275 }	279 }

OLD	NEW

« include/AdblockPlus/FilterEngine.h ('K') | « include/AdblockPlus/FilterEngine.h ('k') | src/GlobalJsObject.cpp » ('j') | src/GlobalJsObject.cpp » ('J')