From 2f4fc005937e75d931eb6ef87a3fe16364d45113 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 26 Jun 2014 21:59:27 -0700 Subject: Stick everything in a namespace --- src/proto2/any-user.hpp | 3 +++ src/proto2/any-user_test.cpp | 4 ++++ src/proto2/char-map.hpp | 3 +++ src/proto2/char-map_test.cpp | 4 ++++ src/proto2/char-user.hpp | 3 +++ src/proto2/char-user_test.cpp | 4 ++++ src/proto2/fwd.hpp | 3 +++ src/proto2/include_clif_t_test.cpp | 3 +++ src/proto2/include_consts_test.cpp | 3 +++ src/proto2/include_cstdint_test.cpp | 3 +++ src/proto2/include_enums_test.cpp | 3 +++ src/proto2/include_human_time_diff_test.cpp | 3 +++ src/proto2/include_ids_test.cpp | 3 +++ src/proto2/include_ip_test.cpp | 3 +++ src/proto2/include_little_test.cpp | 3 +++ src/proto2/include_login_t_test.cpp | 3 +++ src/proto2/include_skill_t_test.cpp | 3 +++ src/proto2/include_strs_test.cpp | 3 +++ src/proto2/include_timer_t_test.cpp | 3 +++ src/proto2/include_utils_test.cpp | 3 +++ src/proto2/include_version_test.cpp | 3 +++ src/proto2/include_vstring_test.cpp | 3 +++ src/proto2/login-admin.hpp | 3 +++ src/proto2/login-admin_test.cpp | 4 ++++ src/proto2/login-char.hpp | 3 +++ src/proto2/login-char_test.cpp | 4 ++++ src/proto2/login-user.hpp | 3 +++ src/proto2/login-user_test.cpp | 4 ++++ src/proto2/map-user.hpp | 3 +++ src/proto2/map-user_test.cpp | 4 ++++ src/proto2/types.hpp | 4 ++++ 31 files changed, 101 insertions(+) (limited to 'src/proto2') diff --git a/src/proto2/any-user.hpp b/src/proto2/any-user.hpp index 6cbf8e3..be77b21 100644 --- a/src/proto2/any-user.hpp +++ b/src/proto2/any-user.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is a public protocol, and changes require client cooperation template<> @@ -210,5 +212,6 @@ bool network_to_native(Packet_Payload<0x8000> *native, NetPacket_Payload<0x8000> return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_ANY_USER_HPP diff --git a/src/proto2/any-user_test.cpp b/src/proto2/any-user_test.cpp index 5f9747c..3cf15bf 100644 --- a/src/proto2/any-user_test.cpp +++ b/src/proto2/any-user_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/char-map.hpp b/src/proto2/char-map.hpp index 6383130..bd16099 100644 --- a/src/proto2/char-map.hpp +++ b/src/proto2/char-map.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is an internal protocol, and can be changed without notice template<> @@ -3532,5 +3534,6 @@ bool network_to_native(Packet_Repeat<0x3827> *native, NetPacket_Repeat<0x3827> n return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_CHAR_MAP_HPP diff --git a/src/proto2/char-map_test.cpp b/src/proto2/char-map_test.cpp index e941f1a..b4ba642 100644 --- a/src/proto2/char-map_test.cpp +++ b/src/proto2/char-map_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/char-user.hpp b/src/proto2/char-user.hpp index 2fc3856..89d19de 100644 --- a/src/proto2/char-user.hpp +++ b/src/proto2/char-user.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is a public protocol, and changes require client cooperation template<> @@ -618,5 +620,6 @@ bool network_to_native(Packet_Fixed<0x0071> *native, NetPacket_Fixed<0x0071> net return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_CHAR_USER_HPP diff --git a/src/proto2/char-user_test.cpp b/src/proto2/char-user_test.cpp index 696b6e4..ade1843 100644 --- a/src/proto2/char-user_test.cpp +++ b/src/proto2/char-user_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/fwd.hpp b/src/proto2/fwd.hpp index d41b7fe..82d917d 100644 --- a/src/proto2/fwd.hpp +++ b/src/proto2/fwd.hpp @@ -23,6 +23,8 @@ # include +namespace tmwa +{ template class Packet_Fixed; template class NetPacket_Fixed; template class Packet_Payload; @@ -1719,5 +1721,6 @@ template<> struct NetPacket_Payload<0x8000>; +} // namespace tmwa #endif // TMWA_PROTO2_FWD_HPP diff --git a/src/proto2/include_clif_t_test.cpp b/src/proto2/include_clif_t_test.cpp index 75d36a0..f0125fe 100644 --- a/src/proto2/include_clif_t_test.cpp +++ b/src/proto2/include_clif_t_test.cpp @@ -20,6 +20,8 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_Position1 = Position1; using Test_NetPosition1 = NetPosition1; using Test_Position2 = Position2; @@ -36,3 +38,4 @@ using Test_SP = SP; using Test_LOOK = LOOK; using Test_IOff2 = IOff2; using Test_SOff1 = SOff1; +} // namespace tmwa diff --git a/src/proto2/include_consts_test.cpp b/src/proto2/include_consts_test.cpp index b093dab..634c0e9 100644 --- a/src/proto2/include_consts_test.cpp +++ b/src/proto2/include_consts_test.cpp @@ -20,4 +20,7 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_PartyMember = PartyMember; +} // namespace tmwa diff --git a/src/proto2/include_cstdint_test.cpp b/src/proto2/include_cstdint_test.cpp index 7462057..917a325 100644 --- a/src/proto2/include_cstdint_test.cpp +++ b/src/proto2/include_cstdint_test.cpp @@ -20,7 +20,10 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_uint8_t = uint8_t; using Test_uint16_t = uint16_t; using Test_uint32_t = uint32_t; using Test_uint64_t = uint64_t; +} // namespace tmwa diff --git a/src/proto2/include_enums_test.cpp b/src/proto2/include_enums_test.cpp index 6fd81f8..f409d28 100644 --- a/src/proto2/include_enums_test.cpp +++ b/src/proto2/include_enums_test.cpp @@ -20,7 +20,10 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_SEX = SEX; using Test_Option = Option; using Test_EPOS = EPOS; using Test_ItemLook = ItemLook; +} // namespace tmwa diff --git a/src/proto2/include_human_time_diff_test.cpp b/src/proto2/include_human_time_diff_test.cpp index 3a5cc49..2e16c99 100644 --- a/src/proto2/include_human_time_diff_test.cpp +++ b/src/proto2/include_human_time_diff_test.cpp @@ -20,4 +20,7 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_HumanTimeDiff = HumanTimeDiff; +} // namespace tmwa diff --git a/src/proto2/include_ids_test.cpp b/src/proto2/include_ids_test.cpp index 7dc26dc..1c1eeca 100644 --- a/src/proto2/include_ids_test.cpp +++ b/src/proto2/include_ids_test.cpp @@ -20,6 +20,8 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_Species = Species; using Test_AccountId = AccountId; using Test_CharId = CharId; @@ -27,3 +29,4 @@ using Test_PartyId = PartyId; using Test_ItemNameId = ItemNameId; using Test_BlockId = BlockId; using Test_GmLevel = GmLevel; +} // namespace tmwa diff --git a/src/proto2/include_ip_test.cpp b/src/proto2/include_ip_test.cpp index a489d9a..d380651 100644 --- a/src/proto2/include_ip_test.cpp +++ b/src/proto2/include_ip_test.cpp @@ -20,4 +20,7 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_IP4Address = IP4Address; +} // namespace tmwa diff --git a/src/proto2/include_little_test.cpp b/src/proto2/include_little_test.cpp index 5e62b33..08a4fbd 100644 --- a/src/proto2/include_little_test.cpp +++ b/src/proto2/include_little_test.cpp @@ -20,7 +20,10 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_Byte = Byte; using Test_Little16 = Little16; using Test_Little32 = Little32; using Test_Little64 = Little64; +} // namespace tmwa diff --git a/src/proto2/include_login_t_test.cpp b/src/proto2/include_login_t_test.cpp index 3273ba3..808e02e 100644 --- a/src/proto2/include_login_t_test.cpp +++ b/src/proto2/include_login_t_test.cpp @@ -20,4 +20,7 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_VERSION_2 = VERSION_2; +} // namespace tmwa diff --git a/src/proto2/include_skill_t_test.cpp b/src/proto2/include_skill_t_test.cpp index e4b957f..4bd944f 100644 --- a/src/proto2/include_skill_t_test.cpp +++ b/src/proto2/include_skill_t_test.cpp @@ -20,6 +20,9 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_SkillID = SkillID; using Test_StatusChange = StatusChange; using Test_SkillFlags = SkillFlags; +} // namespace tmwa diff --git a/src/proto2/include_strs_test.cpp b/src/proto2/include_strs_test.cpp index eeaed7c..67b41f4 100644 --- a/src/proto2/include_strs_test.cpp +++ b/src/proto2/include_strs_test.cpp @@ -20,6 +20,8 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_AccountName = AccountName; using Test_AccountPass = AccountPass; using Test_AccountEmail = AccountEmail; @@ -28,3 +30,4 @@ using Test_PartyName = PartyName; using Test_VarName = VarName; using Test_CharName = CharName; using Test_MapName = MapName; +} // namespace tmwa diff --git a/src/proto2/include_timer_t_test.cpp b/src/proto2/include_timer_t_test.cpp index 859757f..a936021 100644 --- a/src/proto2/include_timer_t_test.cpp +++ b/src/proto2/include_timer_t_test.cpp @@ -20,5 +20,8 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_tick_t = tick_t; using Test_interval_t = interval_t; +} // namespace tmwa diff --git a/src/proto2/include_utils_test.cpp b/src/proto2/include_utils_test.cpp index 106bb59..5b6c92d 100644 --- a/src/proto2/include_utils_test.cpp +++ b/src/proto2/include_utils_test.cpp @@ -20,6 +20,9 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_TimeT = TimeT; using Test_timestamp_seconds_buffer = timestamp_seconds_buffer; using Test_timestamp_milliseconds_buffer = timestamp_milliseconds_buffer; +} // namespace tmwa diff --git a/src/proto2/include_version_test.cpp b/src/proto2/include_version_test.cpp index ed31f49..13856b9 100644 --- a/src/proto2/include_version_test.cpp +++ b/src/proto2/include_version_test.cpp @@ -20,4 +20,7 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_Version = Version; +} // namespace tmwa diff --git a/src/proto2/include_vstring_test.cpp b/src/proto2/include_vstring_test.cpp index 24504ed..3570a29 100644 --- a/src/proto2/include_vstring_test.cpp +++ b/src/proto2/include_vstring_test.cpp @@ -20,8 +20,11 @@ #include "../poison.hpp" +namespace tmwa +{ using Test_VString_15_ = VString<15>; using Test_VString_19_ = VString<19>; using Test_VString_23_ = VString<23>; using Test_VString_31_ = VString<31>; using Test_VString_39_ = VString<39>; +} // namespace tmwa diff --git a/src/proto2/login-admin.hpp b/src/proto2/login-admin.hpp index 30cdb8b..f4965d0 100644 --- a/src/proto2/login-admin.hpp +++ b/src/proto2/login-admin.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is an internal protocol, and can be changed without notice template<> @@ -2214,5 +2216,6 @@ bool network_to_native(Packet_Fixed<0x7955> *native, NetPacket_Fixed<0x7955> net return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_LOGIN_ADMIN_HPP diff --git a/src/proto2/login-admin_test.cpp b/src/proto2/login-admin_test.cpp index 2cccef2..1bc322d 100644 --- a/src/proto2/login-admin_test.cpp +++ b/src/proto2/login-admin_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/login-char.hpp b/src/proto2/login-char.hpp index a2e0b8e..6b96a03 100644 --- a/src/proto2/login-char.hpp +++ b/src/proto2/login-char.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is an internal protocol, and can be changed without notice template<> @@ -1231,5 +1233,6 @@ bool network_to_native(Packet_Fixed<0x2741> *native, NetPacket_Fixed<0x2741> net return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_LOGIN_CHAR_HPP diff --git a/src/proto2/login-char_test.cpp b/src/proto2/login-char_test.cpp index ec25fb5..0b61645 100644 --- a/src/proto2/login-char_test.cpp +++ b/src/proto2/login-char_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/login-user.hpp b/src/proto2/login-user.hpp index 5eda66c..822d224 100644 --- a/src/proto2/login-user.hpp +++ b/src/proto2/login-user.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is a public protocol, and changes require client cooperation template<> @@ -321,5 +323,6 @@ bool network_to_native(Packet_Fixed<0x006a> *native, NetPacket_Fixed<0x006a> net return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_LOGIN_USER_HPP diff --git a/src/proto2/login-user_test.cpp b/src/proto2/login-user_test.cpp index 293a458..fa2128a 100644 --- a/src/proto2/login-user_test.cpp +++ b/src/proto2/login-user_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/map-user.hpp b/src/proto2/map-user.hpp index 598ef3b..efeb0bc 100644 --- a/src/proto2/map-user.hpp +++ b/src/proto2/map-user.hpp @@ -25,6 +25,8 @@ # include "types.hpp" +namespace tmwa +{ // This is a public protocol, and changes require client cooperation template<> @@ -7927,5 +7929,6 @@ bool network_to_native(Packet_Fixed<0x0212> *native, NetPacket_Fixed<0x0212> net return rv; } +} // namespace tmwa #endif // TMWA_PROTO2_MAP_USER_HPP diff --git a/src/proto2/map-user_test.cpp b/src/proto2/map-user_test.cpp index 7d404fe..75d39d5 100644 --- a/src/proto2/map-user_test.cpp +++ b/src/proto2/map-user_test.cpp @@ -21,3 +21,7 @@ // This is a generated file, edit tools/protocol.py instead #include "../poison.hpp" + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/proto2/types.hpp b/src/proto2/types.hpp index e6730c1..bd13114 100644 --- a/src/proto2/types.hpp +++ b/src/proto2/types.hpp @@ -41,6 +41,8 @@ # include "../map/clif.t.hpp" # include "../map/skill.t.hpp" +namespace tmwa +{ template bool native_to_network(T *network, T native) { @@ -1417,4 +1419,6 @@ bool network_to_native(Storage *native, NetStorage network) return rv; } +} // namespace tmwa + #endif // TMWA_PROTO2_TYPES_HPP -- cgit v1.2.3-60-g2f50