Some minor code changes in preparation of C++11.

With the introduction of user-defined literals in C++11, code that uses format macro constants with no space after the preceding string literal is invalid. Also avoid using code that will be seen by a C++11 compiler as an invalid use of a variably-modified type (a variable-length array or type derived from it).
cmangos · Aug 30, 2015 · 4011efb · 4011efb
1 parent 39e1066
commit 4011efb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/src/game/Calendar.cpp b/src/game/Calendar.cpp
@@ -293,7 +293,7 @@ CalendarEvent* CalendarMgr::AddEvent(ObjectGuid const& guid, std::string title,
 
     uint64 nId = GetNewEventId();
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::AddEvent> ID("UI64FMTD"), '%s', Desc > '%s', type=%u, repeat=%u, maxInvites=%u, dungeonId=%d, flags=%u",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::AddEvent> ID(" UI64FMTD "), '%s', Desc > '%s', type=%u, repeat=%u, maxInvites=%u, dungeonId=%d, flags=%u",
                      nId, title.c_str(), description.c_str(), type, repeatable, maxInvites, dungeonId, flags);
 
     CalendarEvent& newEvent = m_EventStore[nId];
@@ -311,7 +311,7 @@ CalendarEvent* CalendarMgr::AddEvent(ObjectGuid const& guid, std::string title,
 
     CharacterDatabase.escape_string(title);
     CharacterDatabase.escape_string(description);
-    CharacterDatabase.PExecute("INSERT INTO calendar_events VALUES ("UI64FMTD", %u, %u, %u, %u, %d, %u, '%s', '%s')",
+    CharacterDatabase.PExecute("INSERT INTO calendar_events VALUES (" UI64FMTD ", %u, %u, %u, %u, %d, %u, '%s', '%s')",
                                nId,
                                guid.GetCounter(),
                                guildId,
@@ -395,7 +395,7 @@ CalendarInvite* CalendarMgr::AddInvite(CalendarEvent* event, ObjectGuid const& s
         return NULL;
     }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Add Invite> eventId["UI64FMTD"], senderGuid[%s], inviteGuid[%s], Status[%u], rank[%u], text[%s], time[%u]",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Add Invite> eventId[" UI64FMTD "], senderGuid[%s], inviteGuid[%s], Status[%u], rank[%u], text[%s], time[%u]",
                      event->EventId, senderGuid.GetString().c_str(), inviteeGuid.GetString().c_str(), uint32(status), uint32(rank), text.c_str(), uint32(statusTime));
 
     if (!event->AddInvite(invite))
@@ -405,7 +405,7 @@ CalendarInvite* CalendarMgr::AddInvite(CalendarEvent* event, ObjectGuid const& s
         return NULL;
     }
 
-    CharacterDatabase.PExecute("INSERT INTO calendar_invites VALUES ("UI64FMTD", "UI64FMTD", %u, %u, %u, %u, %u)",
+    CharacterDatabase.PExecute("INSERT INTO calendar_invites VALUES (" UI64FMTD ", " UI64FMTD ", %u, %u, %u, %u, %u)",
                                invite->InviteId,
                                event->EventId,
                                inviteeGuid.GetCounter(),
@@ -669,7 +669,7 @@ void CalendarMgr::LoadCalendarsFromDB()
             }
             while (invitesQuery->NextRow());
 
-            sLog.outString(">> Loaded "UI64FMTD" invites! %s", totalInvites, (deletedInvites != 0) ? "(deleted some invites without corresponding event!)" : "");
+            sLog.outString(">> Loaded " UI64FMTD " invites! %s", totalInvites, (deletedInvites != 0) ? "(deleted some invites without corresponding event!)" : "");
         }
         else
         {

diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp
@@ -58,7 +58,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
 
         data << uint8(event->IsGuildEvent());
         data << event->CreatorGuid.WriteAsPacked();
-        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "invite> EventId["UI64FMTD"], InviteId["UI64FMTD"], status[%u], rank[%u]",
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "invite> EventId[" UI64FMTD "], InviteId[" UI64FMTD "], status[%u], rank[%u]",
                          event->EventId, (*itr)->InviteId, uint32((*itr)->Status), uint32((*itr)->Rank));
     }
 
@@ -81,7 +81,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
         data << event->CreatorGuid.WriteAsPacked();
 
         std::string timeStr = TimeToTimestampStr(event->EventTime);
-        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Events> EventId["UI64FMTD"], Title[%s], Time[%s], Type[%u],  Flag[%u], DungeonId[%d], CreatorGuid[%s]",
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Events> EventId[" UI64FMTD "], Title[%s], Time[%s], Type[%u],  Flag[%u], DungeonId[%d], CreatorGuid[%s]",
                          event->EventId, event->Title.c_str(), timeStr.c_str(), uint32(event->Type),
                          uint32(event->Flags), event->DungeonId, event->CreatorGuid.GetString().c_str());
     }
@@ -221,7 +221,7 @@ void WorldSession::HandleCalendarEventSignup(WorldPacket& recv_data)
 
     recv_data >> eventId;
     recv_data >> tentative; // uint8 == bool size in all compilator???
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] Tentative %u", eventId, uint32(tentative));
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] Tentative %u", eventId, uint32(tentative));
 
     if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
     {
@@ -327,7 +327,7 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data)
     recv_data >> UnknownPackedTime;
     recv_data >> flags;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"], InviteId ["UI64FMTD"] Title %s, Description %s, type %u "
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], InviteId [" UI64FMTD "] Title %s, Description %s, type %u "
                      "Repeatable %u, MaxInvites %u, Dungeon ID %d, Flags %u", eventId, inviteId, title.c_str(),
                      description.c_str(), uint32(type), uint32(repetitionType), maxInvites, dungeonId, flags);
 
@@ -400,7 +400,7 @@ void WorldSession::HandleCalendarCopyEvent(WorldPacket& recv_data)
 
     recv_data >> eventId >> inviteId;
     recv_data >> packedTime;
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] inviteId ["UI64FMTD"]",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] inviteId [" UI64FMTD "]",
                      eventId, inviteId);
 
     sCalendarMgr.CopyEvent(eventId, timeBitFieldsToSecs(packedTime), guid);
@@ -524,7 +524,7 @@ void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data)
     uint32 status;
 
     recv_data >> eventId >> inviteId >> status;
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD "], InviteId [" UI64FMTD "], status %u",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], InviteId [" UI64FMTD "], status %u",
                      eventId, inviteId, status);
 
     if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@@ -557,7 +557,7 @@ void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data)
             invite->Status = CalendarInviteStatus(status);
             invite->LastUpdateTime = time(NULL);
 
-            CharacterDatabase.PExecute("UPDATE calendar_invites SET status=%u, lastUpdateTime=%u WHERE inviteId = "UI64FMTD, status, uint32(invite->LastUpdateTime), invite->InviteId);
+            CharacterDatabase.PExecute("UPDATE calendar_invites SET status=%u, lastUpdateTime=%u WHERE inviteId = " UI64FMTD, status, uint32(invite->LastUpdateTime), invite->InviteId);
             sCalendarMgr.SendCalendarEventStatus(invite);
             sCalendarMgr.SendCalendarClearPendingAction(_player);
         }
@@ -581,7 +581,7 @@ void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recv_data)
     recv_data >> invitee.ReadAsPacked();
     recv_data >> inviteId >> ownerInviteId >> eventId;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"], ownerInviteId ["UI64FMTD"], Invitee ([%s] id: ["UI64FMTD"])",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], ownerInviteId [" UI64FMTD "], Invitee ([%s] id: [" UI64FMTD "])",
                      eventId, ownerInviteId, invitee.GetString().c_str(), inviteId);
 
     if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@@ -604,7 +604,7 @@ void WorldSession::HandleCalendarEventStatus(WorldPacket& recv_data)
 
     recv_data >> invitee.ReadAsPacked();
     recv_data >> eventId >> inviteId >> ownerInviteId >> status;
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] ownerInviteId ["UI64FMTD"], Invitee ([%s] id: ["UI64FMTD"], status %u",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] ownerInviteId [" UI64FMTD "], Invitee ([%s] id: [" UI64FMTD "], status %u",
                      eventId, ownerInviteId, invitee.GetString().c_str(), inviteId, status);
 
     if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@@ -654,7 +654,7 @@ void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recv_data)
 
     recv_data >> invitee.ReadAsPacked();
     recv_data >> eventId >>  inviteId >> ownerInviteId >> rank;
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"] ownerInviteId ["UI64FMTD"], Invitee ([%s] id: ["UI64FMTD"], rank %u",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "] ownerInviteId [" UI64FMTD "], Invitee ([%s] id: [" UI64FMTD "], rank %u",
                      eventId, ownerInviteId, invitee.GetString().c_str(), inviteId, rank);
 
     if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
@@ -706,7 +706,7 @@ void WorldSession::HandleCalendarComplain(WorldPacket& recv_data)
 
     recv_data >> badGuyGuid;
     recv_data >> eventId >>  inviteId;
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD"], BadGuyGuid ([%s] inviteId: ["UI64FMTD"])",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], BadGuyGuid ([%s] inviteId: [" UI64FMTD "])",
                      eventId, badGuyGuid.GetString().c_str(), inviteId);
 
     // Remove the invite
@@ -759,7 +759,7 @@ void CalendarMgr::SendCalendarEventInviteAlert(CalendarInvite const* invite)
     data << invite->SenderGuid.WriteAsPacked();
     //data.hexlike();
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInviteAlert> senderGuid[%s], inviteeGuid[%s], EventId["UI64FMTD"], Status[%u], InviteId["UI64FMTD"]",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInviteAlert> senderGuid[%s], inviteeGuid[%s], EventId[" UI64FMTD "], Status[%u], InviteId[" UI64FMTD "]",
                      invite->SenderGuid.GetString().c_str(), invite->InviteeGuid.GetString().c_str(), event->EventId, uint32(invite->Status), invite->InviteId);
 
     if (event->IsGuildEvent() || event->IsGuildAnnouncement())
@@ -799,7 +799,7 @@ void CalendarMgr::SendCalendarEventInvite(CalendarInvite const* invite)
         data << secsToTimeBitFields(statusTime);
     data << uint8(invite->SenderGuid != invite->InviteeGuid); // false only if the invite is sign-up (invitee create himself his invite)
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInvit> %s senderGuid[%s], inviteeGuid[%s], EventId["UI64FMTD"], Status[%u], InviteId["UI64FMTD"]",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarInvit> %s senderGuid[%s], inviteeGuid[%s], EventId[" UI64FMTD "], Status[%u], InviteId[" UI64FMTD "]",
                      preInvite ? "is PreInvite," : "", invite->SenderGuid.GetString().c_str(), invite->InviteeGuid.GetString().c_str(), eventId, uint32(invite->Status), invite->InviteId);
 
     //data.hexlike();
@@ -854,7 +854,7 @@ void CalendarMgr::SendCalendarEvent(Player* player, CalendarEvent const* event,
     if (!player || !event)
         return;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarEvent> sendType[%u], CreatorGuid[%s], EventId["UI64FMTD"], Type[%u], Flags[%u], Title[%s]",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarEvent> sendType[%u], CreatorGuid[%s], EventId[" UI64FMTD "], Type[%u], Flags[%u], Title[%s]",
                      sendType, event->CreatorGuid.GetString().c_str(), event->EventId, uint32(event->Type), event->Flags, event->Title.c_str());
 
     WorldPacket data(SMSG_CALENDAR_SEND_EVENT);
@@ -892,7 +892,7 @@ void CalendarMgr::SendCalendarEvent(Player* player, CalendarEvent const* event,
         data << secsToTimeBitFields(invite->LastUpdateTime);
         data << invite->Text;
 
-        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Invite> InviteId["UI64FMTD"], InviteLvl[%u], Status[%u], Rank[%u],  GuildEvent[%s], Text[%s]",
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "Invite> InviteId[" UI64FMTD "], InviteLvl[%u], Status[%u], Rank[%u],  GuildEvent[%s], Text[%s]",
                          invite->InviteId, uint32(inviteeLevel), uint32(invite->Status), uint32(invite->Rank),
                          (event->IsGuildEvent() && event->GuildId == inviteeGuildId) ? "true" : "false", invite->Text.c_str());
     }

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -8632,7 +8632,8 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced)
         m_speed_rate[mtype] = rate;
         propagateSpeedChange();
 
-        const uint16 SetSpeed2Opc_table[MAX_MOVE_TYPE][2] =
+        typedef const uint16 SpeedOpcodePair[2];
+        SpeedOpcodePair SetSpeed2Opc_table[MAX_MOVE_TYPE] =
         {
             {SMSG_FORCE_WALK_SPEED_CHANGE,        SMSG_SPLINE_SET_WALK_SPEED},
             {SMSG_FORCE_RUN_SPEED_CHANGE,         SMSG_SPLINE_SET_RUN_SPEED},
@@ -8645,21 +8646,23 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced)
             {SMSG_FORCE_PITCH_RATE_CHANGE,        SMSG_SPLINE_SET_PITCH_RATE},
         };
 
+        const SpeedOpcodePair& speedOpcodes = SetSpeed2Opc_table[mtype];
+
         if (forced && GetTypeId() == TYPEID_PLAYER)
         {
             // register forced speed changes for WorldSession::HandleForceSpeedChangeAck
             // and do it only for real sent packets and use run for run/mounted as client expected
             ++((Player*)this)->m_forced_speed_changes[mtype];
 
-            WorldPacket data(Opcodes(SetSpeed2Opc_table[mtype][0]), 18);
+            WorldPacket data(Opcodes(speedOpcodes[0]), 18);
             data << GetPackGUID();
             data << (uint32)0;                              // moveEvent, NUM_PMOVE_EVTS = 0x39
             if (mtype == MOVE_RUN)
                 data << uint8(0);                           // new 2.1.0
             data << float(GetSpeed(mtype));
             ((Player*)this)->GetSession()->SendPacket(&data);
         }
-        WorldPacket data(Opcodes(SetSpeed2Opc_table[mtype][1]), 12);
+        WorldPacket data(Opcodes(speedOpcodes[1]), 12);
         data << GetPackGUID();
         data << float(GetSpeed(mtype));
         SendMessageToSet(&data, false);