From 1c36488dc31b77509a317c91c9c49c0369ec7d00 Mon Sep 17 00:00:00 2001 From: Nuno Date: Sat, 17 Jun 2023 01:13:44 +0200 Subject: [PATCH] Fix --- .../src/entities_game_service/database_guild.cpp | 13 +---- .../src/entities_game_service/database_guild.h | 20 ++------ .../src/entities_game_service/database_plr.cpp | 13 +---- .../src/entities_game_service/database_plr.h | 20 ++------ .../guild_manager/guild_unifier_itf.cpp | 32 ++++++------- .../src/shard_unifier_service/database_mapping.h | 55 +++++++++++++--------- ryzom/tools/pd_parser/cpp_output.h | 2 +- 7 files changed, 62 insertions(+), 93 deletions(-) diff --git a/ryzom/server/src/entities_game_service/database_guild.cpp b/ryzom/server/src/entities_game_service/database_guild.cpp index 90014e7e2..cc4c36c81 100644 --- a/ryzom/server/src/entities_game_service/database_guild.cpp +++ b/ryzom/server/src/entities_game_service/database_guild.cpp @@ -16,18 +16,7 @@ // along with this program. If not, see . ///////////////////////////////////////////////////////////////// -// -// -// -// -// -// WARNING : this is a generated file, don't change it ! -// -// -// -// -// -// +// WARNING : this is a generated file, don't change it ! ///////////////////////////////////////////////////////////////// #include "stdpch.h" diff --git a/ryzom/server/src/entities_game_service/database_guild.h b/ryzom/server/src/entities_game_service/database_guild.h index fb8611cf5..4c51f81f7 100644 --- a/ryzom/server/src/entities_game_service/database_guild.h +++ b/ryzom/server/src/entities_game_service/database_guild.h @@ -1,7 +1,5 @@ -#ifndef INCLUDED_database_GUILD_H -#define INCLUDED_database_GUILD_H // Ryzom - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited // @@ -19,20 +17,12 @@ // along with this program. If not, see . ///////////////////////////////////////////////////////////////// -// -// -// -// -// -// WARNING : this is a generated file, don't change it ! -// -// -// -// -// -// +// WARNING : this is a generated file, don't change it ! ///////////////////////////////////////////////////////////////// +#ifndef INCLUDED_DATABASE_database_GUILD_H +#define INCLUDED_DATABASE_database_GUILD_H + #include "nel/misc/string_common.h" #include "cdb_group.h" #include "player_manager/cdb.h" @@ -1857,4 +1847,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C }; -#endif // INCLUDED_database_GUILD_H +#endif // INCLUDED_DATABASE_database_GUILD_H diff --git a/ryzom/server/src/entities_game_service/database_plr.cpp b/ryzom/server/src/entities_game_service/database_plr.cpp index b98c0bb0b..3165656bd 100644 --- a/ryzom/server/src/entities_game_service/database_plr.cpp +++ b/ryzom/server/src/entities_game_service/database_plr.cpp @@ -16,18 +16,7 @@ // along with this program. If not, see . ///////////////////////////////////////////////////////////////// -// -// -// -// -// -// WARNING : this is a generated file, don't change it ! -// -// -// -// -// -// +// WARNING : this is a generated file, don't change it ! ///////////////////////////////////////////////////////////////// #include "stdpch.h" diff --git a/ryzom/server/src/entities_game_service/database_plr.h b/ryzom/server/src/entities_game_service/database_plr.h index 0c5277073..89af126c8 100644 --- a/ryzom/server/src/entities_game_service/database_plr.h +++ b/ryzom/server/src/entities_game_service/database_plr.h @@ -1,7 +1,5 @@ -#ifndef INCLUDED_database_PLR_H -#define INCLUDED_database_PLR_H // Ryzom - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited // @@ -19,20 +17,12 @@ // along with this program. If not, see . ///////////////////////////////////////////////////////////////// -// -// -// -// -// -// WARNING : this is a generated file, don't change it ! -// -// -// -// -// -// +// WARNING : this is a generated file, don't change it ! ///////////////////////////////////////////////////////////////// +#ifndef INCLUDED_DATABASE_database_PLR_H +#define INCLUDED_DATABASE_database_PLR_H + #include "nel/misc/string_common.h" #include "cdb_group.h" #include "player_manager/cdb.h" @@ -10805,4 +10795,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C }; -#endif // INCLUDED_database_PLR_H +#endif // INCLUDED_DATABASE_database_PLR_H diff --git a/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.cpp b/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.cpp index 873b69f0c..aec2bf356 100644 --- a/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.cpp +++ b/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.cpp @@ -1,5 +1,5 @@ // Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited +// Copyright (C) 2010-2021 Winch Gate Property Limited // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as @@ -70,7 +70,7 @@ namespace GU init = true; } - return handlers; + return handlers; } bool CGuildUnifierClientSkel::fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message) { @@ -161,9 +161,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_guildReady(__message); _ModuleProxy->sendModuleMessage(sender, __message); @@ -179,9 +179,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_receiveForeignGuild(__message, guilds); _ModuleProxy->sendModuleMessage(sender, __message); @@ -197,9 +197,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_updateMemberList(__message, guildId, members); _ModuleProxy->sendModuleMessage(sender, __message); @@ -215,9 +215,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_updateMemberInfo(__message, guildId, membersInfo); _ModuleProxy->sendModuleMessage(sender, __message); @@ -233,9 +233,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_updateGuild(__message, guildInfo); _ModuleProxy->sendModuleMessage(sender, __message); @@ -251,9 +251,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_guildDeleted(__message, guildId); _ModuleProxy->sendModuleMessage(sender, __message); @@ -269,9 +269,9 @@ namespace GU } else { - // send the message for remote dispatching and execution or local queing + // send the message for remote dispatching and execution or local queing NLNET::CMessage __message; - + buildMessageFor_messageToGuildMembers(__message, guildId, messageName, params); _ModuleProxy->sendModuleMessage(sender, __message); diff --git a/ryzom/server/src/shard_unifier_service/database_mapping.h b/ryzom/server/src/shard_unifier_service/database_mapping.h index e96676fef..a340d3cce 100644 --- a/ryzom/server/src/shard_unifier_service/database_mapping.h +++ b/ryzom/server/src/shard_unifier_service/database_mapping.h @@ -2201,7 +2201,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 2 }; @@ -2233,7 +2233,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -2335,7 +2336,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 3 }; @@ -2369,7 +2370,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -3696,7 +3698,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 4 }; @@ -3732,7 +3734,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -3834,7 +3837,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 3 }; @@ -3868,7 +3871,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -3969,7 +3973,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 2 }; @@ -4001,7 +4005,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -4102,7 +4107,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 2 }; @@ -4134,7 +4139,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -4237,7 +4243,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 4 }; @@ -4273,7 +4279,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -4955,7 +4962,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 3 }; @@ -4989,7 +4996,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -5090,7 +5098,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 2 }; @@ -5122,7 +5130,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -6095,7 +6104,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 4 }; @@ -6131,7 +6140,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } @@ -7342,7 +7352,7 @@ namespace RSMGR end_of_enum, invalid_val, - + /// Number of enumerated values nb_enum_items = 2 }; @@ -7374,7 +7384,8 @@ namespace RSMGR }; static NLMISC::CStringConversion conversionTable(TValues_nl_string_conversion_table, sizeof(TValues_nl_string_conversion_table) - / sizeof(TValues_nl_string_conversion_table[0]), invalid_val); + / sizeof(TValues_nl_string_conversion_table[0]), + invalid_val); return conversionTable; } diff --git a/ryzom/tools/pd_parser/cpp_output.h b/ryzom/tools/pd_parser/cpp_output.h index f8ed9c6f8..96183b265 100644 --- a/ryzom/tools/pd_parser/cpp_output.h +++ b/ryzom/tools/pd_parser/cpp_output.h @@ -659,7 +659,7 @@ inline void CCppOutput::flush(const std::string &fileName) buffer.resize(fi.getFileSize(), '*'); fi.serialBuffer((uint8*)(&(buffer[0])), fi.getFileSize()); - // search for $Id: cpp_output.h,v 1.15 2004/12/13 17:19:01 legros Exp $ string in file... + // search for $Id$ string in file... char *searchidstart, *searchidend; char *replaceidstart, *replaceidend; -- 2.11.4.GIT