diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-19 03:38:57 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-19 03:51:11 +0200 |
| commit | 909acdbac3223d8c788b1b5dc42b6dfab8b604ab (patch) | |
| tree | 2a0ade312aad77ca032015c6957a4a9005aa0b94 /dep/acelite/ace/Netlink_Addr.cpp | |
| parent | 5daf3d360686ea8ff2d97a48fca24f0bf42ef098 (diff) | |
| parent | 1866d8cc06e2b8c2722ccf69ee3f52ceda93bc27 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSocket.h
src/server/authserver/Server/RealmAcceptor.h
src/server/game/Accounts/AccountMgr.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/shared/Cryptography/BigNumber.h
src/server/worldserver/RemoteAccess/RASocket.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'dep/acelite/ace/Netlink_Addr.cpp')
| -rw-r--r-- | dep/acelite/ace/Netlink_Addr.cpp | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/dep/acelite/ace/Netlink_Addr.cpp b/dep/acelite/ace/Netlink_Addr.cpp deleted file mode 100644 index 888febb0aa5..00000000000 --- a/dep/acelite/ace/Netlink_Addr.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// $Id: Netlink_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ - -//============================================================================= -/** - * @file Netlink_Addr.cpp - * - * $Id: Netlink_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ - * - * @author Robert Iakobashvilli <coroberti@gmail.com> - * @author Raz Ben Yehuda <raziebe@gmail.com> - */ -//============================================================================= - -#include "ace/Netlink_Addr.h" - -#ifdef ACE_HAS_NETLINK - -#if !defined (__ACE_INLINE__) -#include "ace/Netlink_Addr.inl" -#endif /* __ACE_INLINE__ */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_ALLOC_HOOK_DEFINE(ACE_Netlink_Addr) - -int ACE_Netlink_Addr::set (const ACE_Netlink_Addr &sa) -{ - ACE_OS::memset ((void *) &this->nl_,0,sizeof this->nl_); - this->nl_.nl_family = AF_NETLINK; - this->base_set (sa.get_type (), sa.get_size ()); - return 0; -} - -// Copy constructor. - -ACE_Netlink_Addr::ACE_Netlink_Addr (const ACE_Netlink_Addr &sa) -: ACE_Addr (AF_NETLINK, sa.get_size ()) -{ - this->set (sa); -} - -int ACE_Netlink_Addr::set (const sockaddr_nl *un, int len) -{ - (void) ACE_OS::memcpy ((void *) &this->nl_,un,len); - return 0; -} - -ACE_Netlink_Addr::ACE_Netlink_Addr (const sockaddr_nl *un, int len) -{ - this->set (un, len); -} - -int -ACE_Netlink_Addr::get_pid (void) const -{ - return this->nl_.nl_pid; -} - -int -ACE_Netlink_Addr::get_gid (void) const -{ - return this->nl_.nl_groups; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif - |