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

Unified Diff: include/AdblockPlus/FilterEngine.h

Issue 10169005: Windows specific changes. All tests passing on Windows. (Closed)
Patch Set: Created April 9, 2013, 2:22 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/GlobalJsObject.cpp » ('j') | src/GlobalJsObject.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/AdblockPlus/FilterEngine.h
===================================================================
--- a/include/AdblockPlus/FilterEngine.h
+++ b/include/AdblockPlus/FilterEngine.h
@@ -4,7 +4,13 @@
#include <vector>
#include <map>
#include <string>
+#ifdef _WIN32 || _WIN64
Wladimir Palant 2013/04/09 05:47:07 I would prefer #if _MSC_VER_ here - it's cleaner,
+#include <memory>
+#include <cctype>
+#include <functional>
Wladimir Palant 2013/04/09 05:47:07 Are these two headers really required on Windows?
Oleksandr 2013/04/09 05:54:21 <cctype> - for isspace <functional> - for not1 and
Wladimir Palant 2013/04/09 06:43:48 Then they should be added at the top of FilterEngi
Felix Dahlke 2013/04/09 08:18:06 If it compiles on Linux/Android without them, they
Wladimir Palant 2013/04/09 08:38:32 We are using functions from these headers. It mere
+#else
#include <tr1/memory>
+#endif
namespace AdblockPlus
{
« no previous file with comments | « no previous file | src/GlobalJsObject.cpp » ('j') | src/GlobalJsObject.cpp » ('J')

Powered by Google App Engine
This is Rietveld