From 45115a07e0753fe30bcaac59ec9f3ed4da5048c2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 17 Jan 2017 18:21:09 +0300 Subject: Add missing A_DEFAULT_COPY / A_DELETE_COPY into net. --- src/net/adminhandler.h | 5 +++++ src/net/auctionhandler.h | 5 +++++ src/net/bankhandler.h | 5 +++++ src/net/battlegroundhandler.h | 5 +++++ src/net/beinghandler.h | 5 +++++ src/net/buyingstorehandler.h | 5 +++++ src/net/buysellhandler.h | 5 +++++ src/net/cashshophandler.h | 5 +++++ src/net/chathandler.h | 5 +++++ src/net/ea/inventoryitem.h | 2 ++ src/net/ea/token.h | 5 +++++ src/net/eathena/itemflags.h | 2 ++ src/net/eathena/maptypeproperty2.h | 2 ++ src/net/elementalhandler.h | 5 +++++ src/net/familyhandler.h | 5 +++++ src/net/friendshandler.h | 5 +++++ src/net/gamehandler.h | 5 +++++ src/net/generalhandler.h | 5 +++++ src/net/guildhandler.h | 5 +++++ src/net/homunculushandler.h | 5 +++++ src/net/hostsgroup.h | 2 ++ src/net/inventoryhandler.h | 5 +++++ src/net/loginhandler.h | 2 ++ src/net/mailhandler.h | 5 +++++ src/net/maphandler.h | 5 +++++ src/net/markethandler.h | 5 +++++ src/net/mercenaryhandler.h | 5 +++++ src/net/npchandler.h | 5 +++++ src/net/packetcounters.h | 5 +++++ src/net/packetinfo.h | 2 ++ src/net/packetlimiter.cpp | 2 ++ src/net/partyhandler.h | 5 +++++ src/net/pethandler.h | 5 +++++ src/net/playerhandler.h | 5 +++++ src/net/questhandler.h | 5 +++++ src/net/roulettehandler.h | 5 +++++ src/net/sdltcpnet.cpp | 2 ++ src/net/searchstorehandler.h | 5 +++++ src/net/serverfeatures.h | 5 +++++ src/net/serverinfo.h | 2 ++ src/net/skillhandler.h | 5 +++++ src/net/tradehandler.h | 5 +++++ src/net/vendinghandler.h | 5 +++++ src/net/worldinfo.h | 2 ++ 44 files changed, 190 insertions(+) (limited to 'src') diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h index 5c3204b22..6d3497be3 100644 --- a/src/net/adminhandler.h +++ b/src/net/adminhandler.h @@ -38,6 +38,11 @@ namespace Net class AdminHandler notfinal { public: + AdminHandler() + { } + + A_DELETE_COPY(AdminHandler) + virtual ~AdminHandler() { } diff --git a/src/net/auctionhandler.h b/src/net/auctionhandler.h index a9f0ff287..ce2c004d6 100644 --- a/src/net/auctionhandler.h +++ b/src/net/auctionhandler.h @@ -35,6 +35,11 @@ namespace Net class AuctionHandler notfinal { public: + AuctionHandler() + { } + + A_DELETE_COPY(AuctionHandler) + virtual ~AuctionHandler() { } diff --git a/src/net/bankhandler.h b/src/net/bankhandler.h index 6c34aaa67..a827178fb 100644 --- a/src/net/bankhandler.h +++ b/src/net/bankhandler.h @@ -29,6 +29,11 @@ namespace Net class BankHandler notfinal { public: + BankHandler() + { } + + A_DELETE_COPY(BankHandler) + virtual ~BankHandler() { } diff --git a/src/net/battlegroundhandler.h b/src/net/battlegroundhandler.h index f9cc7ddae..1e62b93ad 100644 --- a/src/net/battlegroundhandler.h +++ b/src/net/battlegroundhandler.h @@ -33,6 +33,11 @@ namespace Net class BattleGroundHandler notfinal { public: + BattleGroundHandler() + { } + + A_DELETE_COPY(BattleGroundHandler) + virtual ~BattleGroundHandler() { } diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index a7ca81a07..ccf998def 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -32,6 +32,11 @@ namespace Net class BeingHandler notfinal { public: + BeingHandler() + { } + + A_DELETE_COPY(BeingHandler) + virtual ~BeingHandler() { } diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h index d99e74e34..007207480 100644 --- a/src/net/buyingstorehandler.h +++ b/src/net/buyingstorehandler.h @@ -36,6 +36,11 @@ namespace Net class BuyingStoreHandler notfinal { public: + BuyingStoreHandler() + { } + + A_DELETE_COPY(BuyingStoreHandler) + virtual ~BuyingStoreHandler() { } diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index fcbdc9465..79cb60b6c 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -31,6 +31,11 @@ namespace Net class BuySellHandler notfinal { public: + BuySellHandler() + { } + + A_DELETE_COPY(BuySellHandler) + virtual ~BuySellHandler() { } diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h index f8f51ff27..18fbb207c 100644 --- a/src/net/cashshophandler.h +++ b/src/net/cashshophandler.h @@ -35,6 +35,11 @@ namespace Net class CashShopHandler notfinal { public: + CashShopHandler() + { } + + A_DELETE_COPY(CashShopHandler) + virtual ~CashShopHandler() { } diff --git a/src/net/chathandler.h b/src/net/chathandler.h index 3b4591a7a..e43912ca2 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -35,6 +35,11 @@ namespace Net class ChatHandler notfinal { public: + ChatHandler() + { } + + A_DELETE_COPY(ChatHandler) + virtual ~ChatHandler() { } diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h index 4c9523a9a..bc5611dfc 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -85,6 +85,8 @@ class InventoryItem final for (int f = 0; f < 4; f ++) cards[f] = cards0[f]; } + + A_DEFAULT_COPY(InventoryItem) }; typedef std::vector InventoryItems; diff --git a/src/net/ea/token.h b/src/net/ea/token.h index b63c56232..b9c0eb1ad 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -28,6 +28,11 @@ struct Token final { + Token() + { } + + A_DELETE_COPY(Token) + BeingId account_ID; int session_ID1; int session_ID2; diff --git a/src/net/eathena/itemflags.h b/src/net/eathena/itemflags.h index e8ef03338..a36099f60 100644 --- a/src/net/eathena/itemflags.h +++ b/src/net/eathena/itemflags.h @@ -27,6 +27,8 @@ namespace EAthena { struct ItemFlagBits final { + A_DEFAULT_COPY(ItemFlagBits) + unsigned char isIdentified : 1; unsigned char isDamaged : 1; unsigned char isFavorite : 1; diff --git a/src/net/eathena/maptypeproperty2.h b/src/net/eathena/maptypeproperty2.h index f31d43282..2bc235798 100644 --- a/src/net/eathena/maptypeproperty2.h +++ b/src/net/eathena/maptypeproperty2.h @@ -27,6 +27,8 @@ namespace EAthena { struct MapTypeProperty2Bits final { + A_DEFAULT_COPY(MapTypeProperty2Bits) + uint32_t party : 1; // allow attack party members (PvP) uint32_t guild : 1; // allow attack guild members (GvG) uint32_t siege : 1; // show emblem in GvG (WoE castle) diff --git a/src/net/elementalhandler.h b/src/net/elementalhandler.h index 6a4aba163..8318de106 100644 --- a/src/net/elementalhandler.h +++ b/src/net/elementalhandler.h @@ -29,6 +29,11 @@ namespace Net class ElementalHandler notfinal { public: + ElementalHandler() + { } + + A_DELETE_COPY(ElementalHandler) + virtual ~ElementalHandler() { } }; diff --git a/src/net/familyhandler.h b/src/net/familyhandler.h index a803eba2f..b213c4824 100644 --- a/src/net/familyhandler.h +++ b/src/net/familyhandler.h @@ -31,6 +31,11 @@ namespace Net class FamilyHandler notfinal { public: + FamilyHandler() + { } + + A_DELETE_COPY(FamilyHandler) + virtual ~FamilyHandler() { } diff --git a/src/net/friendshandler.h b/src/net/friendshandler.h index 1a0dbf3dc..6b9f29a13 100644 --- a/src/net/friendshandler.h +++ b/src/net/friendshandler.h @@ -31,6 +31,11 @@ namespace Net class FriendsHandler notfinal { public: + FriendsHandler() + { } + + A_DELETE_COPY(FriendsHandler) + virtual void invite(const std::string &name) const = 0; virtual void inviteResponse(const int accountId, diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h index d913a6b41..5bd4bca92 100644 --- a/src/net/gamehandler.h +++ b/src/net/gamehandler.h @@ -31,6 +31,11 @@ namespace Net class GameHandler notfinal { public: + GameHandler() + { } + + A_DELETE_COPY(GameHandler) + virtual ~GameHandler() {} diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h index 8d53f0268..480b50948 100644 --- a/src/net/generalhandler.h +++ b/src/net/generalhandler.h @@ -31,6 +31,11 @@ namespace Net class GeneralHandler notfinal { public: + GeneralHandler() + { } + + A_DELETE_COPY(GeneralHandler) + virtual ~GeneralHandler() { } diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h index dd5d92aef..2b1997f92 100644 --- a/src/net/guildhandler.h +++ b/src/net/guildhandler.h @@ -35,6 +35,11 @@ namespace Net class GuildHandler notfinal { public: + GuildHandler() + { } + + A_DELETE_COPY(GuildHandler) + virtual ~GuildHandler() { } diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h index f31e49a01..c5a997b61 100644 --- a/src/net/homunculushandler.h +++ b/src/net/homunculushandler.h @@ -34,6 +34,11 @@ namespace Net class HomunculusHandler notfinal { public: + HomunculusHandler() + { } + + A_DELETE_COPY(HomunculusHandler) + virtual ~HomunculusHandler() { } diff --git a/src/net/hostsgroup.h b/src/net/hostsgroup.h index 963cd984d..ba2b9c05d 100644 --- a/src/net/hostsgroup.h +++ b/src/net/hostsgroup.h @@ -33,6 +33,8 @@ struct HostsGroup final { } + A_DEFAULT_COPY(HostsGroup) + std::string name; StringVect hosts; }; diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index cbcef5153..4c0799b7b 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -35,6 +35,11 @@ namespace Net class InventoryHandler notfinal { public: + InventoryHandler() + { } + + A_DELETE_COPY(InventoryHandler) + virtual ~InventoryHandler() { } diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 07ed6cb2f..b10d8430f 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -34,6 +34,8 @@ namespace Net class LoginHandler notfinal { public: + A_DELETE_COPY(LoginHandler) + void setServer(const ServerInfo &server) { mServer = server; } diff --git a/src/net/mailhandler.h b/src/net/mailhandler.h index c0625c43e..ebe8fc72c 100644 --- a/src/net/mailhandler.h +++ b/src/net/mailhandler.h @@ -31,6 +31,11 @@ namespace Net class MailHandler notfinal { public: + MailHandler() + { } + + A_DELETE_COPY(MailHandler) + virtual ~MailHandler() { } diff --git a/src/net/maphandler.h b/src/net/maphandler.h index 017f3df42..b68fe19f1 100644 --- a/src/net/maphandler.h +++ b/src/net/maphandler.h @@ -29,6 +29,11 @@ namespace Net class MapHandler notfinal { public: + MapHandler() + { } + + A_DELETE_COPY(MapHandler) + virtual ~MapHandler() { } }; diff --git a/src/net/markethandler.h b/src/net/markethandler.h index cd9f5bc20..6ace1e117 100644 --- a/src/net/markethandler.h +++ b/src/net/markethandler.h @@ -37,6 +37,11 @@ namespace Net class MarketHandler notfinal { public: + MarketHandler() + { } + + A_DELETE_COPY(MarketHandler) + virtual ~MarketHandler() { } diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h index b76bb82ef..2fcd4790f 100644 --- a/src/net/mercenaryhandler.h +++ b/src/net/mercenaryhandler.h @@ -34,6 +34,11 @@ namespace Net class MercenaryHandler notfinal { public: + MercenaryHandler() + { } + + A_DELETE_COPY(MercenaryHandler) + virtual ~MercenaryHandler() { } diff --git a/src/net/npchandler.h b/src/net/npchandler.h index eefcbe446..5ef65d1f6 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -47,6 +47,11 @@ class MessageIn; class NpcHandler notfinal { public: + NpcHandler() + { } + + A_DELETE_COPY(NpcHandler) + virtual ~NpcHandler() { } diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h index 95f1611da..6c3e0d8f9 100644 --- a/src/net/packetcounters.h +++ b/src/net/packetcounters.h @@ -28,6 +28,11 @@ class PacketCounters final { public: + PacketCounters() + { } + + A_DELETE_COPY(PacketCounters) + static void incInBytes(const int cnt); static void incInPackets(); diff --git a/src/net/packetinfo.h b/src/net/packetinfo.h index 3b742da78..555314e5a 100644 --- a/src/net/packetinfo.h +++ b/src/net/packetinfo.h @@ -35,6 +35,8 @@ struct PacketInfo final { } + A_DELETE_COPY(PacketInfo) + const char *name; PacketFuncPtr func; int len; diff --git a/src/net/packetlimiter.cpp b/src/net/packetlimiter.cpp index 6f7ac55cb..8c34b6919 100644 --- a/src/net/packetlimiter.cpp +++ b/src/net/packetlimiter.cpp @@ -33,6 +33,8 @@ struct PacketLimit final { + A_DEFAULT_COPY(PacketLimit) + int lastTime; int timeLimit; int cnt; diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index f8cb334eb..9e3e8763d 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -37,6 +37,11 @@ namespace Net class PartyHandler notfinal { public: + PartyHandler() + { } + + A_DELETE_COPY(PartyHandler) + virtual ~PartyHandler() { } diff --git a/src/net/pethandler.h b/src/net/pethandler.h index 5f3dbf53c..2520d56ee 100644 --- a/src/net/pethandler.h +++ b/src/net/pethandler.h @@ -29,6 +29,11 @@ namespace Net class PetHandler notfinal { public: + PetHandler() + { } + + A_DELETE_COPY(PetHandler) + virtual ~PetHandler() { } diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 011b2aa26..72cf8c9de 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -39,6 +39,11 @@ namespace Net class PlayerHandler notfinal { public: + PlayerHandler() + { } + + A_DELETE_COPY(PlayerHandler) + virtual ~PlayerHandler() { } diff --git a/src/net/questhandler.h b/src/net/questhandler.h index f02f48444..37aefbae2 100644 --- a/src/net/questhandler.h +++ b/src/net/questhandler.h @@ -29,6 +29,11 @@ namespace Net class QuestHandler notfinal { public: + QuestHandler() + { } + + A_DELETE_COPY(QuestHandler) + virtual ~QuestHandler() { } diff --git a/src/net/roulettehandler.h b/src/net/roulettehandler.h index 5affbfd09..6a88acdca 100644 --- a/src/net/roulettehandler.h +++ b/src/net/roulettehandler.h @@ -29,6 +29,11 @@ namespace Net class RouletteHandler notfinal { public: + RouletteHandler() + { } + + A_DELETE_COPY(RouletteHandler) + virtual ~RouletteHandler() { } }; diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp index eb752fcf6..fbd852e53 100644 --- a/src/net/sdltcpnet.cpp +++ b/src/net/sdltcpnet.cpp @@ -54,6 +54,8 @@ PRAGMACLANG6(GCC diagnostic pop) // because actual struct is hidden in SDL_net we reinroducing it here struct TCPsocketHack final { + A_DELETE_COPY(TCPsocketHack) + int ready; int channel; IPaddress remoteAddress; diff --git a/src/net/searchstorehandler.h b/src/net/searchstorehandler.h index 1efa0772e..56bcc1ce7 100644 --- a/src/net/searchstorehandler.h +++ b/src/net/searchstorehandler.h @@ -31,6 +31,11 @@ namespace Net class SearchStoreHandler notfinal { public: + SearchStoreHandler() + { } + + A_DELETE_COPY(SearchStoreHandler) + virtual ~SearchStoreHandler() { } diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 698a54e8d..4f9165fd2 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -28,6 +28,11 @@ namespace Net class ServerFeatures notfinal { public: + ServerFeatures() + { } + + A_DELETE_COPY(ServerFeatures) + virtual ~ServerFeatures() { } diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 9ca03f450..c02e67505 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -100,6 +100,8 @@ class ServerInfo final version.second = info.version.second; } + A_DEFAULT_COPY(ServerInfo) + ServerInfo &operator=(const ServerInfo &info) { type = info.type; diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h index 5d04e80b6..299eb633a 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -34,6 +34,11 @@ namespace Net class SkillHandler notfinal { public: + SkillHandler() + { } + + A_DELETE_COPY(SkillHandler) + virtual ~SkillHandler() { } diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index ce460d736..ca125da53 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -34,6 +34,11 @@ namespace Net class TradeHandler notfinal { public: + TradeHandler() + { } + + A_DELETE_COPY(TradeHandler) + virtual ~TradeHandler() { } diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h index 719f0ad1f..f2348607d 100644 --- a/src/net/vendinghandler.h +++ b/src/net/vendinghandler.h @@ -35,6 +35,11 @@ namespace Net class VendingHandler notfinal { public: + VendingHandler() + { } + + A_DELETE_COPY(VendingHandler) + virtual ~VendingHandler() { } diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index 1e568d974..7a1e21c9a 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -45,6 +45,8 @@ struct WorldInfo final { } + A_DELETE_COPY(WorldInfo) + int address; std::string name; uint16_t port; -- cgit v1.2.3-70-g09d2