--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp	Sun Sep 22 14:00:00 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp	Sun Sep 22 14:18:39 2019 +0200
@@ -31,21 +31,21 @@
 #include "jfr/utilities/jfrTypes.hpp"
 #include "runtime/thread.hpp"
 
-class Or {
+class CompositeOperationOr {
  public:
   static bool evaluate(bool value) {
     return !value;
   }
 };
 
-class And {
+class CompositeOperationAnd {
  public:
   static bool evaluate(bool value) {
     return value;
   }
 };
 
-template <typename Operation, typename NextOperation, typename TruthFunction = And>
+template <typename Operation, typename NextOperation, typename TruthFunction = CompositeOperationAnd>
 class CompositeOperation {
  private:
   Operation* _op;