From: <geo...@us...> - 2009-03-25 06:58:45
|
Revision: 2937 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2937&view=rev Author: geoffthemedio Date: 2009-03-25 06:58:31 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Removed some unused exception variables to quiet warnings Modified Paths: -------------- trunk/FreeOrion/network/Message.cpp Modified: trunk/FreeOrion/network/Message.cpp =================================================================== --- trunk/FreeOrion/network/Message.cpp 2009-03-25 05:49:10 UTC (rev 2936) +++ trunk/FreeOrion/network/Message.cpp 2009-03-25 06:58:31 UTC (rev 2937) @@ -603,7 +603,7 @@ std::istringstream is(msg.Text()); FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(lobby_data); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, MultiplayerLobbyData& " << "lobby_data) failed! Message:\n" << msg.Text() << std::endl; throw; @@ -640,7 +640,7 @@ ui_data_available = false; save_state_string_available = false; } - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, bool& single_player_game, " << "int& empire_id, int& current_turn, EmpireManager& empires, " << "Universe& universe, std::map<int, PlayerInfo>& players, OrderSet& " @@ -657,7 +657,7 @@ std::istringstream is(msg.Text()); FREEORION_IARCHIVE_TYPE ia(is); Deserialize(ia, orders); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, OrderSet& orders) failed! " << "Message:\n" << msg.Text() << std::endl; throw; @@ -676,7 +676,7 @@ Deserialize(ia, empires); Deserialize(ia, universe); ia >> BOOST_SERIALIZATION_NVP(players); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, int empire_id, int& " << "current_turn, EmpireManager& empires, Universe& universe, " << "std::map<int, PlayerInfo>& players) failed! Message:\n" @@ -699,7 +699,7 @@ ia >> BOOST_SERIALIZATION_NVP(save_state_string_available); if (save_state_string_available) ia >> BOOST_SERIALIZATION_NVP(save_state_string); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, OrderSet& orders, " << "SaveGameUIData& ui_data) failed! Message:\n" << msg.Text() << std::endl; @@ -715,7 +715,7 @@ FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(phase_id) >> BOOST_SERIALIZATION_NVP(empire_id); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, Message::TurnProgressPhase& " << "phase_id, int& empire_id) failed! Message:\n" << msg.Text() << std::endl; @@ -729,7 +729,7 @@ std::istringstream is(msg.Text()); FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(setup_data); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, SinglePlayerSetupData& " << "setup_data) failed! Message:\n" << msg.Text() << std::endl; throw; @@ -744,7 +744,7 @@ FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(reason) >> BOOST_SERIALIZATION_NVP(reason_player_name); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, Message::EndGameReason& reason, " << "std::string& reason_player_name) failed! Message:\n" << msg.Text() << std::endl; @@ -759,7 +759,7 @@ FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(empire_id) >> BOOST_SERIALIZATION_NVP(empire_name); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, int empire_id, std::string& " << "empire_name) failed! Message:\n" << msg.Text() << std::endl; throw; @@ -775,7 +775,7 @@ ia >> BOOST_SERIALIZATION_NVP(victory_or_defeat) >> BOOST_SERIALIZATION_NVP(reason_string) >> BOOST_SERIALIZATION_NVP(empire_id); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, Message::VictoryOrDefeat " << "victory_or_defeat, std::string& reason_string, int& empire_id) failed! " << "Message:\n" << msg.Text() << std::endl; @@ -789,7 +789,7 @@ std::istringstream is(msg.Text()); FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(combat_data); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, CombatData& " << "combat_data) failed! Message:\n" << msg.Text() << std::endl; throw; @@ -804,7 +804,7 @@ FREEORION_IARCHIVE_TYPE ia(is); ia >> BOOST_SERIALIZATION_NVP(system); Deserialize(ia, combat_universe); - } catch (const boost::archive::archive_exception &e) { + } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, System*& " << "system) failed! Message:\n" << msg.Text() << std::endl; throw; |
From: <tz...@us...> - 2010-04-21 20:47:52
|
Revision: 3514 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3514&view=rev Author: tzlaine Date: 2010-04-21 20:47:46 +0000 (Wed, 21 Apr 2010) Log Message: ----------- Updated the error-notifiction messages in the ExtractMessageData() overloads to reflect changes in thos overloads' signatures. Modified Paths: -------------- trunk/FreeOrion/network/Message.cpp Modified: trunk/FreeOrion/network/Message.cpp =================================================================== --- trunk/FreeOrion/network/Message.cpp 2010-04-19 01:56:07 UTC (rev 3513) +++ trunk/FreeOrion/network/Message.cpp 2010-04-21 20:47:46 UTC (rev 3514) @@ -655,11 +655,12 @@ save_state_string_available = false; } } catch (const boost::archive::archive_exception) { - std::cerr << "ExtractMessageData(const Message& msg, bool& single_player_game, " - << "int& empire_id, int& current_turn, EmpireManager& empires, " - << "Universe& universe, std::map<int, PlayerInfo>& players, OrderSet& " - << "orders, SaveGameUIData& ui_data, bool& loaded_game_data, " - << "bool& ui_data_available) failed! Message:\n" + std::cerr << "ExtractMessageData(const Message& msg, bool& single_player_game, int& empire_id, " + << "int& current_turn, EmpireManager& empires, Universe& universe, " + << "std::map<int, PlayerInfo>& players, OrderSet& orders, " + << "bool& loaded_game_data, bool& ui_data_available, " + << "SaveGameUIData& ui_data, bool& save_state_string_available, " + << "std::string& save_state_string) failed! Message:\n" << msg.Text() << std::endl; throw; } @@ -715,7 +716,9 @@ ia >> BOOST_SERIALIZATION_NVP(save_state_string); } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, OrderSet& orders, " - << "SaveGameUIData& ui_data) failed! Message:\n" + << "bool& ui_data_available, SaveGameUIData& ui_data, " + << "bool& save_state_string_available, std::string& save_state_string) " + << "failed! Message:\n" << msg.Text() << std::endl; throw; } @@ -809,7 +812,9 @@ >> BOOST_SERIALIZATION_NVP(foreign_designs); } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, CombatData& " - << "combat_data) failed! Message:\n" << msg.Text() << std::endl; + << "combat_data, std::vector<CombatSetupGroup>& setup_groups, " + << "ShipDesignMap& foreign_designs) failed! Message:\n" + << msg.Text() << std::endl; throw; } } @@ -850,7 +855,8 @@ Deserialize(ia, combat_universe); } catch (const boost::archive::archive_exception) { std::cerr << "ExtractMessageData(const Message& msg, System*& " - << "system) failed! Message:\n" << msg.Text() << std::endl; + << "system, std::map<int, UniverseObject*>& combat_universe) failed! " + << "Message:\n" << msg.Text() << std::endl; throw; } } |
From: <geo...@us...> - 2013-06-27 02:42:49
|
Revision: 6201 http://sourceforge.net/p/freeorion/code/6201 Author: geoffthemedio Date: 2013-06-27 02:42:44 +0000 (Thu, 27 Jun 2013) Log Message: ----------- Wrapped DiplomaticMessage with missing NVP macro. Modified Paths: -------------- trunk/FreeOrion/network/Message.cpp Modified: trunk/FreeOrion/network/Message.cpp =================================================================== --- trunk/FreeOrion/network/Message.cpp 2013-06-26 09:00:17 UTC (rev 6200) +++ trunk/FreeOrion/network/Message.cpp 2013-06-27 02:42:44 UTC (rev 6201) @@ -504,7 +504,7 @@ std::ostringstream os; { freeorion_oarchive oa(os); - oa << diplo_message; + oa << BOOST_SERIALIZATION_NVP(diplo_message); } return Message(Message::DIPLOMACY, sender, receiver, os.str()); } |
From: <geo...@us...> - 2014-01-15 06:34:49
|
Revision: 6644 http://sourceforge.net/p/freeorion/code/6644 Author: geoffthemedio Date: 2014-01-15 06:34:43 +0000 (Wed, 15 Jan 2014) Log Message: ----------- warning reduction Modified Paths: -------------- trunk/FreeOrion/network/Message.cpp Modified: trunk/FreeOrion/network/Message.cpp =================================================================== --- trunk/FreeOrion/network/Message.cpp 2014-01-15 03:59:38 UTC (rev 6643) +++ trunk/FreeOrion/network/Message.cpp 2014-01-15 06:34:43 UTC (rev 6644) @@ -216,7 +216,7 @@ message.m_type = static_cast<Message::MessageType>(header_buf[0]); message.m_sending_player = header_buf[1]; message.m_receiving_player = header_buf[2]; - message.m_synchronous_response = header_buf[3]; + message.m_synchronous_response = (header_buf[3] != 0); message.m_message_size = header_buf[4]; } @@ -327,7 +327,7 @@ oa << BOOST_SERIALIZATION_NVP(players) << BOOST_SERIALIZATION_NVP(loaded_game_data); Serialize(oa, orders); - bool ui_data_available = ui_data; + bool ui_data_available = (ui_data != 0); oa << BOOST_SERIALIZATION_NVP(ui_data_available); if (ui_data_available) oa << boost::serialization::make_nvp("ui_data", *ui_data); @@ -363,7 +363,7 @@ Serialize(oa, orders); bool ui_data_available = false; oa << BOOST_SERIALIZATION_NVP(ui_data_available); - bool save_state_string_available = save_state_string; // save_state_string pointer may be 0 + bool save_state_string_available = (save_state_string != 0); oa << BOOST_SERIALIZATION_NVP(save_state_string_available); if (save_state_string_available) oa << boost::serialization::make_nvp("save_state_string", *save_state_string); |