X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketProtocol.cci;h=04be16c20dd9cf98ac1a0c3f9a2bedb322601c18;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=1a55451f10fd8ff055f8478b7640a21105694921;hpb=1ad3873b372da6187b1fbc645bf276287d2efb54;p=senf.git diff --git a/Socket/SocketProtocol.cci b/Socket/SocketProtocol.cci index 1a55451..04be16c 100644 --- a/Socket/SocketProtocol.cci +++ b/Socket/SocketProtocol.cci @@ -1,9 +1,9 @@ // $Id$ // // Copyright (C) 2006 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -27,7 +27,8 @@ //#include "SocketProtocol.ih" // Custom includes -#include +#include "../Utils/senfassert.hh" +#include "../Utils/Logger/SenfLog.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// @@ -50,24 +51,16 @@ prefix_ int senf::SocketProtocol::fd() prefix_ void senf::SocketProtocol::fd(int fd) const { - BOOST_ASSERT(! body().valid()); + SENF_ASSERT(! body().valid()); body().fd(fd); } prefix_ senf::SocketProtocol::SocketProtocol() - : body_(0) {} prefix_ senf::SocketProtocol::~SocketProtocol() {} -prefix_ senf::SocketBody & senf::SocketProtocol::body() - const -{ - BOOST_ASSERT( body_ ); - return *body_; -} - ///////////////////////////////cci.e/////////////////////////////////////// #undef prefix_