X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fmuxer%2Fupstream-msg-iter.cpp;h=ea597da228fd9fde4febd56f550e91353ade6c08;hb=HEAD;hp=28f5be4741b92b5f04805d35787e94a248cfbd53;hpb=8de58945ad42801d8a4906f692a5e72e8f967f46;p=babeltrace.git

diff --git a/src/plugins/utils/muxer/upstream-msg-iter.cpp b/src/plugins/utils/muxer/upstream-msg-iter.cpp
index 28f5be47..ea597da2 100644
--- a/src/plugins/utils/muxer/upstream-msg-iter.cpp
+++ b/src/plugins/utils/muxer/upstream-msg-iter.cpp
@@ -33,45 +33,45 @@ namespace {
 bt2::OptionalBorrowedObject<bt2::ConstClockSnapshot> msgCs(const bt2::ConstMessage msg) noexcept
 {
     switch (msg.type()) {
-    case bt2::MessageType::EVENT:
+    case bt2::MessageType::Event:
         if (msg.asEvent().streamClassDefaultClockClass()) {
             return msg.asEvent().defaultClockSnapshot();
         }
 
         break;
-    case bt2::MessageType::PACKET_BEGINNING:
+    case bt2::MessageType::PacketBeginning:
         if (msg.asPacketBeginning().packet().stream().cls().packetsHaveBeginningClockSnapshot()) {
             return msg.asPacketBeginning().defaultClockSnapshot();
         }
 
         break;
-    case bt2::MessageType::PACKET_END:
+    case bt2::MessageType::PacketEnd:
         if (msg.asPacketEnd().packet().stream().cls().packetsHaveEndClockSnapshot()) {
             return msg.asPacketEnd().defaultClockSnapshot();
         }
 
         break;
-    case bt2::MessageType::DISCARDED_EVENTS:
+    case bt2::MessageType::DiscardedEvents:
         if (msg.asDiscardedEvents().stream().cls().discardedEventsHaveDefaultClockSnapshots()) {
             return msg.asDiscardedEvents().beginningDefaultClockSnapshot();
         }
 
         break;
-    case bt2::MessageType::DISCARDED_PACKETS:
+    case bt2::MessageType::DiscardedPackets:
         if (msg.asDiscardedPackets().stream().cls().discardedPacketsHaveDefaultClockSnapshots()) {
             return msg.asDiscardedPackets().beginningDefaultClockSnapshot();
         }
 
         break;
-    case bt2::MessageType::MESSAGE_ITERATOR_INACTIVITY:
+    case bt2::MessageType::MessageIteratorInactivity:
         return msg.asMessageIteratorInactivity().clockSnapshot();
-    case bt2::MessageType::STREAM_BEGINNING:
+    case bt2::MessageType::StreamBeginning:
         if (msg.asStreamBeginning().streamClassDefaultClockClass()) {
             return msg.asStreamBeginning().defaultClockSnapshot();
         }
 
         break;
-    case bt2::MessageType::STREAM_END:
+    case bt2::MessageType::StreamEnd:
         if (msg.asStreamEnd().streamClassDefaultClockClass()) {
             return msg.asStreamEnd().defaultClockSnapshot();
         }
@@ -108,7 +108,7 @@ UpstreamMsgIter::ReloadStatus UpstreamMsgIter::reload()
     if (G_UNLIKELY(!_mMsgs.msgs)) {
         /* Still none: no more */
         _mMsgTs.reset();
-        return ReloadStatus::NO_MORE;
+        return ReloadStatus::NoMore;
     } else {
         if (const auto cs = msgCs(this->msg())) {
             _mMsgTs = cs->nsFromOrigin();
@@ -120,7 +120,7 @@ UpstreamMsgIter::ReloadStatus UpstreamMsgIter::reload()
         }
 
         _mDiscardRequired = true;
-        return ReloadStatus::MORE;
+        return ReloadStatus::More;
     }
 }