Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

src/shared/ContentType.cpp

Index: src/shared/ContentType.cpp
diff --git a/src/shared/ContentType.cpp b/src/shared/ContentType.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7b7cd754fe6ac83b3510d556b02b551b26b4f9b9
--- /dev/null
+++ b/src/shared/ContentType.cpp
@@ -0,0 +1,19 @@
+#include "ContentType.h"
+#include "Communication.h"
+
+using AdblockPlus::FilterEngine;
+using Communication::InputBuffer;
+using Communication::OutputBuffer;
+
+InputBuffer& operator>>(InputBuffer& in, FilterEngine::ContentType& contentType)

[Oleksandr, 2015/01/30 12:39:11]

This seems like a lot of code for very little purpose. How about we just remove
the ContentType files in general? We were fine without overloading these in your
previous change-sets

[sergei, 2015/01/30 13:20:06]

I've removed these files.

[Eric, 2015/02/02 06:58:27]

Sergei added this at my suggestion in order to gather the representation of
ContentType into a single place. The way it is now we have casts appearing out
of nowhere. Defining these operators is a better design.

I'm not going to argue the point strongly, but using these definitions is better
than not using them.

+{
+  int32_t type;
+  in >> type;
+  contentType = static_cast<FilterEngine::ContentType>(contentType);
+  return in;
+}
+
+OutputBuffer& operator<<(OutputBuffer& out, FilterEngine::ContentType contentType)
+{
+  return out << static_cast<int32_t>(contentType);
+}