From 840179a65c94d90e0ed74dace966d986fa3c2090 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 10 Jul 2010 14:06:33 +0200 Subject: [PATCH] Changed: optimizations for PCH --- code/nel/src/net/stdnet.h | 2 ++ code/nel/src/net/udp_sock.cpp | 4 +--- .../client_sheets/automaton_list_sheet.cpp | 2 -- .../src/client_sheets/building_sheet.cpp | 2 -- .../src/client_sheets/emot_list_sheet.cpp | 2 -- .../src/client_sheets/forage_source_sheet.cpp | 1 - .../client_sheets/text_emot_list_sheet.cpp | 3 --- code/ryzom/client/src/ig_season_callback.cpp | 1 + .../src/interface_v3/bot_chat_page_trade.cpp | 2 -- code/ryzom/client/src/micro_life_manager.cpp | 2 -- .../ryzom/client/src/motion/user_controls.cpp | 9 --------- code/ryzom/client/src/net_manager.cpp | 4 ---- code/ryzom/client/src/network_connection.cpp | 3 --- code/ryzom/client/src/npc_icon.cpp | 1 - code/ryzom/client/src/pacs_client.cpp | 9 --------- .../client/src/precipitation_clip_grid.cpp | 10 ---------- code/ryzom/client/src/prim_file.cpp | 9 --------- code/ryzom/client/src/session_browser.cpp | 2 -- code/ryzom/client/src/sky.cpp | 7 ------- code/ryzom/client/src/sound_manager.cpp | 10 ---------- code/ryzom/client/src/stage.cpp | 4 +--- code/ryzom/client/src/stdpch.h | 20 +++++++++++++++++++ code/ryzom/client/src/time_client.cpp | 2 -- code/ryzom/client/src/timed_fx_manager.cpp | 2 -- .../client/src/weather_manager_client.cpp | 10 ---------- .../_backup_service_interface_singleton.cpp | 1 - code/ryzom/common/src/game_share/action.cpp | 13 ------------ .../common/src/game_share/action_factory.cpp | 13 ------------ .../common/src/game_share/action_generic.cpp | 13 ------------ .../common/src/game_share/action_position.cpp | 13 ------------ .../src/game_share/change_tracker_client.cpp | 2 -- .../src/game_share/continuous_action.cpp | 13 ------------ .../common/src/game_share/data_set_base.cpp | 2 -- code/ryzom/common/src/game_share/mirror.cpp | 5 ----- .../src/game_share/mirror_prop_value.cpp | 1 - code/ryzom/common/src/game_share/object.cpp | 14 +------------ .../common/src/game_share/persistent_data.cpp | 3 --- .../game_share/property_allocator_client.cpp | 2 -- code/ryzom/common/src/game_share/scenario.cpp | 4 ---- .../src/game_share/server_admin_module.cpp | 2 -- .../src/game_share/server_edition_module.cpp | 2 -- code/ryzom/common/src/game_share/simlag.cpp | 8 -------- .../common/src/game_share/slot_equipment.cpp | 2 -- code/ryzom/common/src/game_share/stdpch.h | 19 +++++++++++++++++- 44 files changed, 44 insertions(+), 211 deletions(-) diff --git a/code/nel/src/net/stdnet.h b/code/nel/src/net/stdnet.h index 1a2c52874..ec0748af4 100644 --- a/code/nel/src/net/stdnet.h +++ b/code/nel/src/net/stdnet.h @@ -41,6 +41,8 @@ #include #include +#include + #include "nel/misc/debug.h" #include "nel/misc/common.h" diff --git a/code/nel/src/net/udp_sock.cpp b/code/nel/src/net/udp_sock.cpp index 535e5550e..d8dab0c88 100644 --- a/code/nel/src/net/udp_sock.cpp +++ b/code/nel/src/net/udp_sock.cpp @@ -20,9 +20,7 @@ #include "nel/net/net_log.h" #ifdef NL_OS_WINDOWS -# if defined(NL_COMP_VC7) || defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) -# include -# endif +# include # define NOMINMAX # include # define socklen_t int diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp index ae76b823b..2504dec51 100644 --- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp @@ -29,8 +29,6 @@ #include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_dfn.h" #include "nel/georges/u_form_loader.h" -// STD -#include /////////// // USING // diff --git a/code/ryzom/client/src/client_sheets/building_sheet.cpp b/code/ryzom/client/src/client_sheets/building_sheet.cpp index 176a9f0ec..b9d68991a 100644 --- a/code/ryzom/client/src/client_sheets/building_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/building_sheet.cpp @@ -25,8 +25,6 @@ #include "building_sheet.h" // Georges #include "nel/georges/u_form_elm.h" -// STD -#include diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp b/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp index 78a9a9f74..8dc789cff 100644 --- a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp @@ -29,8 +29,6 @@ #include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_dfn.h" #include "nel/georges/u_form_loader.h" -// STD -#include /////////// // USING // diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp b/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp index 018ad5f62..e35e8d58b 100644 --- a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp @@ -19,7 +19,6 @@ #include "stdpch.h" // First include for pre-compiled headers. #include "forage_source_sheet.h" #include "nel/georges/u_form_elm.h" -#include using namespace std; using namespace NLGEORGES; diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp index 015d7b0a3..9c61ddec0 100644 --- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp @@ -29,9 +29,6 @@ #include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_dfn.h" #include "nel/georges/u_form_loader.h" -// STD -#include -#include /////////// // USING // diff --git a/code/ryzom/client/src/ig_season_callback.cpp b/code/ryzom/client/src/ig_season_callback.cpp index f2018977e..e8cb175ed 100644 --- a/code/ryzom/client/src/ig_season_callback.cpp +++ b/code/ryzom/client/src/ig_season_callback.cpp @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . + #include "stdpch.h" #include "ig_season_callback.h" diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp index 1073d89b0..02a929772 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp @@ -48,8 +48,6 @@ #include "../sheet_manager.h" #include "../user_entity.h" #include "view_bitmap.h" -// -#include using namespace std::rel_ops; diff --git a/code/ryzom/client/src/micro_life_manager.cpp b/code/ryzom/client/src/micro_life_manager.cpp index 042b8dc1a..32c4b5a58 100644 --- a/code/ryzom/client/src/micro_life_manager.cpp +++ b/code/ryzom/client/src/micro_life_manager.cpp @@ -42,8 +42,6 @@ // #include "nel/misc/check_fpu.h" -#include - using namespace std::rel_ops; extern NLLIGO::CLigoConfig LigoConfig; diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/code/ryzom/client/src/motion/user_controls.cpp index e5a3a58be..d681fd9cd 100644 --- a/code/ryzom/client/src/motion/user_controls.cpp +++ b/code/ryzom/client/src/motion/user_controls.cpp @@ -22,11 +22,6 @@ ////////////// // Includes // ////////////// -// 3D Interface. -#include "nel/3d/u_driver.h" -#include "nel/3d/u_scene.h" -#include "nel/3d/u_camera.h" -#include "nel/3d/u_transform.h" // GAME SHARE #include "game_share/bot_chat_types.h" // Client. @@ -39,10 +34,6 @@ #include "../entities.h" #include "../view.h" #include "../input.h" -// Misc -#include "nel/misc/mouse_device.h" -// Std -#include // #include "../r2/editor.h" diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp index 5b68eb419..97cbd9c6d 100644 --- a/code/ryzom/client/src/net_manager.cpp +++ b/code/ryzom/client/src/net_manager.cpp @@ -21,10 +21,6 @@ // INCLUDE // ///////////// #include "stdpch.h" -// Misc -#include -#include -#include // Game Share #include "game_share/generic_xml_msg_mngr.h" #include "game_share/msg_client_server.h" diff --git a/code/ryzom/client/src/network_connection.cpp b/code/ryzom/client/src/network_connection.cpp index b309a9a99..687b7d14a 100644 --- a/code/ryzom/client/src/network_connection.cpp +++ b/code/ryzom/client/src/network_connection.cpp @@ -63,9 +63,6 @@ #include "../../../test/network/sb5000/client/graph.h" #endif -#include -#include - // *************************************************************************** // Smooth ServerTick setup diff --git a/code/ryzom/client/src/npc_icon.cpp b/code/ryzom/client/src/npc_icon.cpp index 788e5320f..99d0ed515 100644 --- a/code/ryzom/client/src/npc_icon.cpp +++ b/code/ryzom/client/src/npc_icon.cpp @@ -20,7 +20,6 @@ #include "game_share/generic_xml_msg_mngr.h" #include "entities.h" #include "net_manager.h" -#include using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/pacs_client.cpp b/code/ryzom/client/src/pacs_client.cpp index 739c95841..16147f0f9 100644 --- a/code/ryzom/client/src/pacs_client.cpp +++ b/code/ryzom/client/src/pacs_client.cpp @@ -21,20 +21,11 @@ // INCLUDE // ///////////// #include "stdpch.h" -#include -// Misc. -#include "nel/misc/vector.h" -// Pacs Interface. -#include "nel/pacs/u_retriever_bank.h" -#include "nel/pacs/u_global_retriever.h" -#include "nel/pacs/u_primitive_block.h" // Client. #include "pacs_client.h" #include "user_entity.h" #include "ig_callback.h" #include "ig_client.h" -// std -#include /////////// // USING // diff --git a/code/ryzom/client/src/precipitation_clip_grid.cpp b/code/ryzom/client/src/precipitation_clip_grid.cpp index 03cba6ec5..6bf8cfda0 100644 --- a/code/ryzom/client/src/precipitation_clip_grid.cpp +++ b/code/ryzom/client/src/precipitation_clip_grid.cpp @@ -19,17 +19,7 @@ #include "stdpch.h" -// TMP TMP - -#include "nel/pacs/u_global_retriever.h" -#include "nel/pacs/u_global_position.h" -#include "nel/3d/u_driver.h" -#include "nel/3d/u_visual_collision_manager.h" -#include "nel/misc/matrix.h" -#include "nel/misc/hierarchical_timer.h" -#include "nel/misc/system_info.h" #include "precipitation_clip_grid.h" -#include using namespace NLMISC; diff --git a/code/ryzom/client/src/prim_file.cpp b/code/ryzom/client/src/prim_file.cpp index 354eff459..c9839956e 100644 --- a/code/ryzom/client/src/prim_file.cpp +++ b/code/ryzom/client/src/prim_file.cpp @@ -22,17 +22,8 @@ ///////////// #include "stdpch.h" -// Misc. -#include "nel/misc/path.h" -#include "nel/misc/i_xml.h" -#include "nel/misc/file.h" -// 3D Interface. // game share #include "game_share/brick_types.h" -// PACS -#include "nel/pacs/u_global_position.h" -// std -#include // Client #include "prim_file.h" #include "client_cfg.h" diff --git a/code/ryzom/client/src/session_browser.cpp b/code/ryzom/client/src/session_browser.cpp index 290b15de5..e0be8ccf0 100644 --- a/code/ryzom/client/src/session_browser.cpp +++ b/code/ryzom/client/src/session_browser.cpp @@ -20,8 +20,6 @@ #include "game_share/r2_share_itf.h" -#include - using namespace std; using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/client/src/sky.cpp b/code/ryzom/client/src/sky.cpp index d641d584f..560cf7313 100644 --- a/code/ryzom/client/src/sky.cpp +++ b/code/ryzom/client/src/sky.cpp @@ -15,13 +15,6 @@ // along with this program. If not, see . #include "stdpch.h" -#include -// -#include "nel/3d/u_driver.h" -#include "nel/3d/u_scene.h" -#include "nel/3d/u_animation_set.h" -#include "nel/3d/u_play_list.h" -#include "nel/3d/u_play_list_manager.h" // #include "sky.h" #include "client_sheets/sky_sheet.h" diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index 907acc1c5..47916f5fc 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/code/ryzom/client/src/sound_manager.cpp @@ -21,14 +21,6 @@ ////////////// // INCLUDES // ////////////// -// misc -#include "nel/misc/path.h" -#include "nel/misc/vector.h" -// 3D -#include "nel/3d/u_particle_system_sound.h" -// pacs -#include "nel/pacs/u_global_retriever.h" -#include "nel/pacs/u_global_position.h" // client #include "sound_manager.h" #include "pacs_client.h" @@ -41,8 +33,6 @@ #include "global.h" // game share #include "game_share/cst_loader.h" -// std. -#include // If you compile using the nel distrib and you don't have the source, you must undef this symbol #if !FINAL_VERSION diff --git a/code/ryzom/client/src/stage.cpp b/code/ryzom/client/src/stage.cpp index e2e773251..01d2c4c1a 100644 --- a/code/ryzom/client/src/stage.cpp +++ b/code/ryzom/client/src/stage.cpp @@ -20,11 +20,9 @@ // INCLUDE // ///////////// #include "stdpch.h" // First include for pre-compiled headers. -// Misc -#include "nel/misc/vectord.h" // Application #include "stage.h" -#include +#include "game_share/entity_types.h" /////////// diff --git a/code/ryzom/client/src/stdpch.h b/code/ryzom/client/src/stdpch.h index 2af740efb..bfc6f0236 100644 --- a/code/ryzom/client/src/stdpch.h +++ b/code/ryzom/client/src/stdpch.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,8 @@ #include #include #include +#include +#include #include #include @@ -53,9 +56,21 @@ #include #include #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include #include #include @@ -66,6 +81,9 @@ #include #include #include +#include +#include +#include #include #include @@ -74,6 +92,8 @@ #include #include #include +#include +#include #include diff --git a/code/ryzom/client/src/time_client.cpp b/code/ryzom/client/src/time_client.cpp index 70c7fe0f7..94bbca554 100644 --- a/code/ryzom/client/src/time_client.cpp +++ b/code/ryzom/client/src/time_client.cpp @@ -33,8 +33,6 @@ #include "game_share/zc_shard_common.h" #include "weather.h" #include "game_share/light_cycle.h" -// Std. -#include /////////// diff --git a/code/ryzom/client/src/timed_fx_manager.cpp b/code/ryzom/client/src/timed_fx_manager.cpp index 958d84426..60c88e868 100644 --- a/code/ryzom/client/src/timed_fx_manager.cpp +++ b/code/ryzom/client/src/timed_fx_manager.cpp @@ -31,8 +31,6 @@ #include "fx_manager.h" #include "nel/misc/check_fpu.h" -#include - #if defined(NL_DEBUG) && defined(NL_OS_WINDOWS) #include diff --git a/code/ryzom/client/src/weather_manager_client.cpp b/code/ryzom/client/src/weather_manager_client.cpp index 5acad01f8..f4b94d4a8 100644 --- a/code/ryzom/client/src/weather_manager_client.cpp +++ b/code/ryzom/client/src/weather_manager_client.cpp @@ -16,16 +16,6 @@ #include "stdpch.h" -#include - -#include "nel/georges/u_form_loader.h" -#include "nel/georges/u_form.h" -#include "nel/misc/smart_ptr.h" -#include "nel/misc/matrix.h" -#include "nel/misc/random.h" -#include "nel/3d/u_scene.h" -#include "nel/3d/u_landscape.h" -#include "nel/3d/u_particle_system_instance.h" // #include "game_share/light_cycle.h" #include "game_share/time_weather_season/weather_predict.h" diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp index 11e7312fa..cb7a58bd1 100644 --- a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp +++ b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp @@ -21,7 +21,6 @@ #include "stdpch.h" #include "_backup_service_interface_singleton.h" #include "utils.h" -#include "nel/net/service.h" //------------------------------------------------------------------------------------------------- diff --git a/code/ryzom/common/src/game_share/action.cpp b/code/ryzom/common/src/game_share/action.cpp index c103c4622..21032fe42 100644 --- a/code/ryzom/common/src/game_share/action.cpp +++ b/code/ryzom/common/src/game_share/action.cpp @@ -16,19 +16,6 @@ #include "stdpch.h" - -// -// Includes -// - -#include -#include - -#include -#include - -#include - #include "action.h" // diff --git a/code/ryzom/common/src/game_share/action_factory.cpp b/code/ryzom/common/src/game_share/action_factory.cpp index 94bc4f90a..8627152b8 100644 --- a/code/ryzom/common/src/game_share/action_factory.cpp +++ b/code/ryzom/common/src/game_share/action_factory.cpp @@ -17,19 +17,6 @@ #include "stdpch.h" - -// -// Includes -// - -#include -#include - -#include -#include - -#include - #include "action_factory.h" diff --git a/code/ryzom/common/src/game_share/action_generic.cpp b/code/ryzom/common/src/game_share/action_generic.cpp index 6edc28589..c0e2568b5 100644 --- a/code/ryzom/common/src/game_share/action_generic.cpp +++ b/code/ryzom/common/src/game_share/action_generic.cpp @@ -17,19 +17,6 @@ #include "stdpch.h" - -// -// Includes -// - -#include -#include - -#include -#include - -#include - #include "action_generic.h" // diff --git a/code/ryzom/common/src/game_share/action_position.cpp b/code/ryzom/common/src/game_share/action_position.cpp index 060c5e157..770bf8804 100644 --- a/code/ryzom/common/src/game_share/action_position.cpp +++ b/code/ryzom/common/src/game_share/action_position.cpp @@ -17,19 +17,6 @@ #include "stdpch.h" - -// -// Includes -// - -#include -#include - -#include -#include - -#include - #include "action_position.h" // diff --git a/code/ryzom/common/src/game_share/change_tracker_client.cpp b/code/ryzom/common/src/game_share/change_tracker_client.cpp index af880f46b..6d0d9dc5d 100644 --- a/code/ryzom/common/src/game_share/change_tracker_client.cpp +++ b/code/ryzom/common/src/game_share/change_tracker_client.cpp @@ -19,8 +19,6 @@ #include "stdpch.h" #include "change_tracker_client.h" -#include - using namespace NLMISC; diff --git a/code/ryzom/common/src/game_share/continuous_action.cpp b/code/ryzom/common/src/game_share/continuous_action.cpp index c396abce2..de3729270 100644 --- a/code/ryzom/common/src/game_share/continuous_action.cpp +++ b/code/ryzom/common/src/game_share/continuous_action.cpp @@ -17,19 +17,6 @@ #include "stdpch.h" - -// -// Includes -// - -#include -#include - -#include -#include - -#include - #include "continuous_action.h" // diff --git a/code/ryzom/common/src/game_share/data_set_base.cpp b/code/ryzom/common/src/game_share/data_set_base.cpp index e153b5d44..54b980d31 100644 --- a/code/ryzom/common/src/game_share/data_set_base.cpp +++ b/code/ryzom/common/src/game_share/data_set_base.cpp @@ -20,8 +20,6 @@ #include "data_set_base.h" #include -// Dependency on NLNET::IService only for config file access for TDataSetSheet::getConfigDataSetSize() -#include #include "ryzom_entity_id.h" using namespace std; diff --git a/code/ryzom/common/src/game_share/mirror.cpp b/code/ryzom/common/src/game_share/mirror.cpp index 1d2855678..31304614b 100644 --- a/code/ryzom/common/src/game_share/mirror.cpp +++ b/code/ryzom/common/src/game_share/mirror.cpp @@ -19,12 +19,7 @@ #include "stdpch.h" #include "mirror.h" #include "synchronised_message.h" -#include -#include -#include -#include #include "tick_proxy_time_measure.h" -#include using namespace NLMISC; using namespace NLNET; diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.cpp b/code/ryzom/common/src/game_share/mirror_prop_value.cpp index 6e4b806b0..641baaae6 100644 --- a/code/ryzom/common/src/game_share/mirror_prop_value.cpp +++ b/code/ryzom/common/src/game_share/mirror_prop_value.cpp @@ -18,7 +18,6 @@ #include "stdpch.h" #include "mirror_prop_value.h" -#include sint32 NbAllocdListCells = 0; diff --git a/code/ryzom/common/src/game_share/object.cpp b/code/ryzom/common/src/game_share/object.cpp index f4330e75f..f395bcf7a 100644 --- a/code/ryzom/common/src/game_share/object.cpp +++ b/code/ryzom/common/src/game_share/object.cpp @@ -21,21 +21,9 @@ #include "stdpch.h" #include "object.h" -#include "nel/misc/debug.h" -#include "nel/misc/singleton.h" -#include "nel/misc/string_common.h" -#include "game_share/utils.h" +#include "utils.h" #include -#include "nel/misc/bit_mem_stream.h" - -#include -#include - -#include -#include -#include -#include namespace R2 { diff --git a/code/ryzom/common/src/game_share/persistent_data.cpp b/code/ryzom/common/src/game_share/persistent_data.cpp index 371cc367a..9d8f8a893 100644 --- a/code/ryzom/common/src/game_share/persistent_data.cpp +++ b/code/ryzom/common/src/game_share/persistent_data.cpp @@ -28,9 +28,6 @@ //------------------------------------------------------------------------- #include "stdpch.h" -#include "nel/misc/file.h" -#include "nel/misc/path.h" -#include "nel/misc/sstring.h" #include "utils.h" #include "persistent_data.h" #include "persistent_data_tree.h" diff --git a/code/ryzom/common/src/game_share/property_allocator_client.cpp b/code/ryzom/common/src/game_share/property_allocator_client.cpp index ef064d51b..b5cd00200 100644 --- a/code/ryzom/common/src/game_share/property_allocator_client.cpp +++ b/code/ryzom/common/src/game_share/property_allocator_client.cpp @@ -18,8 +18,6 @@ #include "stdpch.h" #include "property_allocator_client.h" -#include -#include #include "mirrored_data_set.h" using namespace NLMISC; diff --git a/code/ryzom/common/src/game_share/scenario.cpp b/code/ryzom/common/src/game_share/scenario.cpp index 74306ff71..0a25acddd 100644 --- a/code/ryzom/common/src/game_share/scenario.cpp +++ b/code/ryzom/common/src/game_share/scenario.cpp @@ -21,10 +21,6 @@ #include "stdpch.h" #include "scenario.h" - -#include -#include - #include "object.h" diff --git a/code/ryzom/common/src/game_share/server_admin_module.cpp b/code/ryzom/common/src/game_share/server_admin_module.cpp index 39833a859..b3743ad6c 100644 --- a/code/ryzom/common/src/game_share/server_admin_module.cpp +++ b/code/ryzom/common/src/game_share/server_admin_module.cpp @@ -48,8 +48,6 @@ #include "nel/misc/o_xml.h" #include "nel/misc/i_xml.h" -#include - using namespace std; using namespace NLMISC; diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index 0ef27648e..f1f03163f 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -23,8 +23,6 @@ #include "server_edition_module.h" -#include - #include "dms.h" #include "nel/net/unified_network.h" diff --git a/code/ryzom/common/src/game_share/simlag.cpp b/code/ryzom/common/src/game_share/simlag.cpp index 37486bd21..68c9e2c04 100644 --- a/code/ryzom/common/src/game_share/simlag.cpp +++ b/code/ryzom/common/src/game_share/simlag.cpp @@ -22,14 +22,6 @@ // Includes // -#include -#include - -#include -#include - -#include - // // Using // diff --git a/code/ryzom/common/src/game_share/slot_equipment.cpp b/code/ryzom/common/src/game_share/slot_equipment.cpp index 6c1259707..16414604c 100644 --- a/code/ryzom/common/src/game_share/slot_equipment.cpp +++ b/code/ryzom/common/src/game_share/slot_equipment.cpp @@ -21,8 +21,6 @@ #include "slot_equipment.h" #include "nel/misc/string_conversion.h" -#include - using namespace std; using namespace NLMISC; diff --git a/code/ryzom/common/src/game_share/stdpch.h b/code/ryzom/common/src/game_share/stdpch.h index b85276b65..94a05e8df 100644 --- a/code/ryzom/common/src/game_share/stdpch.h +++ b/code/ryzom/common/src/game_share/stdpch.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -27,10 +28,14 @@ #include #include #include -//#include +#include #include #include #include +#include +#include +#include +#include #include #include @@ -42,8 +47,20 @@ #include #include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include + #include "utils.h"