Changed: optimizations for PCH

15 years ago · 0383b14169
parent 9b06f1c481
commit 0383b14169
44 changed files with 44 additions and 211 deletions
--- a/code/nel/src/net/stdnet.h
+++ b/code/nel/src/net/stdnet.h
@ -41,6 +41,8 @@
 #include <exception>
 #include <cctype>

+#include <errno.h>
+
 #include "nel/misc/debug.h"

 #include "nel/misc/common.h"
--- 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 <winsock2.h>
-#	endif
+#	include <winsock2.h>
 #	define NOMINMAX
 #	include <windows.h>
 #	define socklen_t int
--- 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 <string>

 ///////////
 // USING //
--- 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 <string>



--- 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 <string>

 ///////////
 // USING //
--- 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 <string>

 using namespace std;
 using namespace NLGEORGES;
--- 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 <string>
-#include <vector>

 ///////////
 // USING //
--- 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 <http://www.gnu.org/licenses/>.
+
 #include "stdpch.h"

 #include "ig_season_callback.h"
--- 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 <utility>

 using namespace std::rel_ops;

--- 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 <utility>
-
 using namespace std::rel_ops;

 extern NLLIGO::CLigoConfig	LigoConfig;
--- 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 <vector>
 //
 #include "../r2/editor.h"

--- 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 <nel/misc/command.h>
-#include <nel/misc/progress_callback.h>
-#include <nel/misc/bit_mem_stream.h>
 // Game Share
 #include "game_share/generic_xml_msg_mngr.h"
 #include "game_share/msg_client_server.h"
--- 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 <set>
-#include <errno.h>
-

 // ***************************************************************************
 // Smooth ServerTick setup
--- 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 <nel/misc/command.h>

 using namespace std;
 using namespace NLMISC;
--- 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 <memory>
-// 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 <map>

 ///////////
 // USING //
--- 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 <algorithm>


 using namespace NLMISC;
--- 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 <string>
 // Client
 #include "prim_file.h"
 #include "client_cfg.h"
--- 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 <queue>
-
 using namespace std;
 using namespace NLMISC;
 using namespace NLNET;
--- 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 <http://www.gnu.org/licenses/>.

 #include "stdpch.h"
-#include <memory>
-//
-#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"
--- 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 <fstream>

 // If you compile using the nel distrib and you don't have the source, you must undef this symbol
 #if !FINAL_VERSION
--- 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 <game_share/entity_types.h>
+#include "game_share/entity_types.h"


 ///////////
--- a/code/ryzom/client/src/stdpch.h
+++ b/code/ryzom/client/src/stdpch.h
@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <time.h>
+#include <errno.h>

 #include <string>
 #include <vector>
@ -32,6 +33,8 @@
 #include <utility>
 #include <deque>
 #include <fstream>
+#include <functional>
+#include <memory>

 #include <nel/misc/common.h>
 #include <nel/misc/debug.h>
@ -53,9 +56,21 @@
 #include <nel/misc/types_nl.h>
 #include <nel/misc/events.h>
 #include <nel/misc/file.h>
+#include <nel/misc/random.h>
 #include <nel/misc/string_mapper.h>
 #include <nel/misc/smart_ptr.h>
+#include <nel/misc/mouse_device.h>
+#include <nel/misc/vectord.h>
+#include <nel/misc/i_xml.h>
+#include <nel/misc/system_info.h>
+#include <nel/misc/progress_callback.h>

+#include <nel/georges/u_form_loader.h>
+#include <nel/georges/u_form.h>
+
+#include <nel/3d/u_landscape.h>
+#include <nel/3d/u_particle_system_instance.h>
+#include <nel/3d/u_particle_system_sound.h>
 #include <nel/3d/u_animation_set.h>
 #include <nel/3d/u_driver.h>
 #include <nel/3d/u_text_context.h>
@ -66,6 +81,9 @@
 #include <nel/3d/u_instance_group.h>
 #include <nel/3d/u_instance.h>
 #include <nel/3d/u_texture.h>
+#include <nel/3d/u_transform.h>
+#include <nel/3d/u_play_list.h>
+#include <nel/3d/u_play_list_manager.h>

 #include <nel/net/callback_client.h>
 #include <nel/net/udp_sock.h>
@ -74,6 +92,8 @@
 #include <nel/pacs/u_global_retriever.h>
 #include <nel/pacs/u_global_position.h>
 #include <nel/pacs/u_move_primitive.h>
+#include <nel/pacs/u_retriever_bank.h>
+#include <nel/pacs/u_primitive_block.h>

 #include <nel/sound/sound_anim_manager.h>

--- 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 <map>


 ///////////
--- 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 <utility>
-

 #if defined(NL_DEBUG) && defined(NL_OS_WINDOWS)
 	#include <crtdbg.h>
--- 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 <functional>
-
-#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"
--- 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"


 //-------------------------------------------------------------------------------------------------
--- 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 <string>
-#include <queue>
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
-
-#include <nel/net/udp_sock.h>
-
 #include "action.h"

 //
--- 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 <string>
-#include <queue>
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
-
-#include <nel/net/udp_sock.h>
-
 #include "action_factory.h"


--- 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 <string>
-#include <queue>
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
-
-#include <nel/net/udp_sock.h>
-
 #include "action_generic.h"

 //
--- 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 <string>
-#include <queue>
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
-
-#include <nel/net/udp_sock.h>
-
 #include "action_position.h"

 //
--- 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 <nel/misc/shared_memory.h>
-
 using namespace NLMISC;


--- 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 <string>
-#include <queue>
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
-
-#include <nel/net/udp_sock.h>
-
 #include "continuous_action.h"

 //
--- 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 <nel/georges/u_form_elm.h>

-// Dependency on NLNET::IService only for config file access for TDataSetSheet::getConfigDataSetSize()
-#include <nel/net/service.h>
 #include "ryzom_entity_id.h"

 using namespace std;
--- 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 <nel/georges/load_form.h>
-#include <nel/misc/command.h>
-#include <nel/misc/config_file.h>
-#include <nel/net/service.h>
 #include "tick_proxy_time_measure.h"
-#include <functional>

 using namespace NLMISC;
 using namespace NLNET;
--- 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 <nel/misc/variable.h>


 sint32 NbAllocdListCells = 0;
--- 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 <zlib.h>
-#include "nel/misc/bit_mem_stream.h"
-
-#include <assert.h>
-#include <algorithm>
-
-#include <set>
-#include <vector>
-#include <map>
-#include <limits>

 namespace R2
 {
--- 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"
--- 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 <nel/misc/shared_memory.h>
-#include <nel/net/unified_network.h>
 #include "mirrored_data_set.h"

 using namespace NLMISC;
--- 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 <sstream>
-#include <assert.h>
-
 #include "object.h"


--- 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 <string>
-

 using namespace std;
 using namespace NLMISC;
--- 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 <memory>
-
 #include "dms.h"

 #include "nel/net/unified_network.h"
--- a/code/ryzom/common/src/game_share/simlag.cpp
+++ b/code/ryzom/common/src/game_share/simlag.cpp
@ -22,14 +22,6 @@
 // Includes
 //

-#include <string>
-#include <queue>
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
-
-#include <nel/net/udp_sock.h>
-
 //
 // Using
 //
--- 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 <string>
-
 using namespace std;
 using namespace NLMISC;

--- a/code/ryzom/common/src/game_share/stdpch.h
+++ b/code/ryzom/common/src/game_share/stdpch.h
@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <time.h>
+#include <assert.h>

 #include <string>
 #include <vector>
@ -27,10 +28,14 @@
 #include <map>
 #include <set>
 #include <algorithm>
-//#include <sstream>
+#include <sstream>
 #include <exception>
 #include <utility>
 #include <deque>
+#include <limits>
+#include <queue>
+#include <memory>
+#include <functional>

 #include <nel/misc/common.h>
 #include <nel/misc/debug.h>
@ -42,8 +47,20 @@
 #include <nel/misc/rgba.h>
 #include <nel/misc/sheet_id.h>
 #include <nel/misc/command.h>
+#include <nel/misc/config_file.h>
 #include <nel/misc/variable.h>
+#include <nel/misc/shared_memory.h>
+#include <nel/misc/file.h>
+#include <nel/misc/path.h>
+#include <nel/misc/singleton.h>
+#include <nel/misc/string_common.h>
+#include <nel/misc/sstring.h>
+#include <nel/misc/bit_mem_stream.h>

+#include <nel/net/udp_sock.h>
+#include <nel/net/unified_network.h>
 #include <nel/net/service.h>

+#include <nel/georges/load_form.h>
+
 #include "utils.h"