--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp	Sun Sep 22 14:00:00 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp	Sun Sep 22 14:18:39 2019 +0200
@@ -323,7 +323,7 @@
   WriteOperation wo(chunkwriter);
   WriterHost<WriteOperation> wh(wo);
   CheckpointReleaseOperation cro(mspace, Thread::current(), false);
-  CompositeOperation<WriterHost<WriteOperation>, CheckpointReleaseOperation, And> co(&wh, &cro);
+  CompositeOperation<WriterHost<WriteOperation>, CheckpointReleaseOperation, CompositeOperationAnd> co(&wh, &cro);
   assert(mspace->is_full_empty(), "invariant");
   process_free_list(co, mspace);
   return wo.processed();

--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp	Sun Sep 22 14:00:00 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp	Sun Sep 22 14:18:39 2019 +0200
@@ -604,7 +604,7 @@
 
 typedef Retired<JfrBuffer, true> NonRetired;
 typedef Excluded<JfrBuffer, true> NonExcluded;
-typedef CompositeOperation<NonRetired, NonExcluded, And> BufferPredicate;
+typedef CompositeOperation<NonRetired, NonExcluded> BufferPredicate;
 typedef PredicatedMutexedWriteOp<WriteOperation, BufferPredicate> ThreadLocalMutexedWriteOperation;
 typedef PredicatedConcurrentWriteOp<WriteOperation, BufferPredicate> ThreadLocalConcurrentWriteOperation;
 

--- 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;