Windows specific changes. All tests passing on Windows.

include/AdblockPlus/FilterEngine.h

 #ifndef ADBLOCKPLUS_FILTER_ENGINE_H
 #define ADBLOCKPLUS_FILTER_ENGINE_H
 
 #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, just in case we ever try
compiling via gcc on Windows.

+#ifdef WIN32
 #include <memory>
-#include <cctype>
-#include <functional>

[Wladimir Palant, 2013/04/09 05:47:07]

Are these two headers really required on Windows? What for?

[Oleksandr, 2013/04/09 05:54:21]

<cctype> - for isspace
<functional> - for not1 and ptr_fun

[Wladimir Palant, 2013/04/09 06:43:48]

Then they should be added at the top of FilterEngine.cpp, right after algorithm.
No need for it to be Windows-only either, sounds like they really should be
there on Linux/Android as well.

[Felix Dahlke, 2013/04/09 08:18:06]

If it compiles on Linux/Android without them, they shouldn't be there IMO.
Unused includes make things pretty complex over time.

[Wladimir Palant, 2013/04/09 08:38:32]

We are using functions from these headers. It merely compiles because these
headers are included somewhere, probably in algorithm.h. So they are by no means
unused, if we omit them we expose ourselves to issues due to internal compiler
changes.

 #else
 #include <tr1/memory>
 #endif
-
 namespace AdblockPlus
 {
   class JsEngine;
   class FilterEngine;
 
   class JsObject
   {
   public:
     std::string GetProperty(const std::string& name, const std::string& defaultValue) const;
     int GetProperty(const std::string& name, int defaultValue) const;
@@ skipping 17 matching lines @@
 
     FilterEngine& filterEngine;
     std::map<std::string, std::string> stringProperties;
     std::map<std::string, int> intProperties;
     std::map<std::string, bool> boolProperties;
 #else
     JsObject();
 #endif
   };
 
-  enum FilterType {BLOCKING_RULE, EXCEPTION_RULE,
-                   ELEMHIDE_RULE, ELEMHIDE_EXCEPTION_RULE,
-                   COMMENT_RULE, INVALID_RULE};
-
   class Filter : public JsObject,
                  public std::tr1::enable_shared_from_this<Filter>
   {
     friend class FilterEngine;
 
   public:
+    enum Type {TYPE_BLOCKING, TYPE_EXCEPTION,
+               TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION,
+               TYPE_COMMENT, TYPE_INVALID};
+
     bool IsListed() const;
     void AddToList();
     void RemoveFromList();
 
   private:
 #if FILTER_ENGINE_STUBS
     Filter(FilterEngine& filterEngine, const std::string& text);
 #else
     Filter();
 #endif
@@ skipping 43 matching lines @@
 #if FILTER_ENGINE_STUBS
     std::map<std::string, FilterPtr> knownFilters;
     std::vector<FilterPtr> listedFilters;
     std::map<std::string, SubscriptionPtr> knownSubscriptions;
     std::vector<SubscriptionPtr> listedSubscriptions;
 #endif
   };
 }
 
 #endif