From 7b778bbb9919ed4039a74511f8d4bf535bb55a5d Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 4 Sep 2010 18:24:53 +0200 Subject: [PATCH] Changed: Don't use "using namespace" in .h --- code/nel/include/nel/3d/tile_lumel.h | 2 -- code/nel/samples/net/udp/receive_task.h | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/nel/include/nel/3d/tile_lumel.h b/code/nel/include/nel/3d/tile_lumel.h index 13f52ba39..be4277d3e 100644 --- a/code/nel/include/nel/3d/tile_lumel.h +++ b/code/nel/include/nel/3d/tile_lumel.h @@ -23,8 +23,6 @@ #include -using namespace NLMISC; - namespace NL3D { diff --git a/code/nel/samples/net/udp/receive_task.h b/code/nel/samples/net/udp/receive_task.h index 1bebc3308..79c671a99 100644 --- a/code/nel/samples/net/udp/receive_task.h +++ b/code/nel/samples/net/udp/receive_task.h @@ -26,7 +26,6 @@ #include "nel/net/udp_sock.h" #include -using namespace std; const uint32 MsgHeaderSize = 1+8; // 8 for the date @@ -72,12 +71,12 @@ struct TReceivedMessage uint32 userSize() { return (uint32)_Data.size() - MsgHeaderSize; } /// Return the data vector (event type header byte + user data) - vector& data() { return _Data; } + std::vector& data() { return _Data; } private: /// One byte for event type (header), followed by user data - vector _Data; + std::vector _Data; public: @@ -85,7 +84,7 @@ public: NLNET::CInetAddress AddrFrom; /// Placeholder vector for address info - vector VAddrFrom; + std::vector VAddrFrom; };