Added additional operators to RestrictedInt and made

[senf.git] / senf / Socket / FileHandle.cci

diff --git a/senf/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci
index 6db39f5..4dd99a7 100644 (file)
--- a/senf/Socket/FileHandle.cci
+++ b/senf/Socket/FileHandle.cci
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief FileHandle inline non-template implementation
@@ -27,14 +32,13 @@
 //#include "FileHandle.ih"
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/senfassert.hh>
 #include <errno.h>
-#include "../Utils/Exception.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::FileBody
 
 prefix_ senf::FileBody::FileBody(int fd)
@@ -78,8 +82,8 @@ prefix_ bool senf::FileBody::readable()
 prefix_ bool senf::FileBody::waitReadable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), true, 
-                     (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
+    return pollCheck(fd(), true,
+                     (timeout==senf::ClockService::clock_type(-1)?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
 prefix_ bool senf::FileBody::writeable()
@@ -91,8 +95,8 @@ prefix_ bool senf::FileBody::writeable()
 prefix_ bool senf::FileBody::waitWriteable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), false, 
-                     (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
+    return pollCheck(fd(), false,
+                     (timeout==senf::ClockService::clock_type(-1)?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
 prefix_ bool senf::FileBody::oobReadable()
@@ -104,23 +108,23 @@ prefix_ bool senf::FileBody::oobReadable()
 prefix_ bool senf::FileBody::waitOOBReadable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), true, 
-                     (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)), true);
+    return pollCheck(fd(), true,
+                     (timeout==senf::ClockService::clock_type(-1)?-1:senf::ClockService::in_milliseconds(timeout)), true);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::FileHandle
 
 prefix_ senf::FileBody & senf::FileHandle::body()
 {
-    SENF_ASSERT(body_);
+    SENF_ASSERT(body_, "dereferencing in-valid() FileHandle");
     return *body_;
 }
 
 prefix_ senf::FileBody const & senf::FileHandle::body()
     const
 {
-    SENF_ASSERT(body_);
+    SENF_ASSERT(body_, "dereferencing in-valid() FileHandle");
     return *body_;
 }
 
@@ -228,8 +232,7 @@ prefix_ senf::FileBody & senf::FileHandle::body(FileHandle & handle)
     return handle.body();
 }
 
-prefix_ senf::FileBody const &
-senf::FileHandle::body(FileHandle const & handle)
+prefix_ senf::FileBody const & senf::FileHandle::body(FileHandle const & handle)
 {
     return handle.body();
 }
@@ -239,14 +242,12 @@ prefix_ void senf::FileHandle::fd(int fd)
     body().fd(fd);
 }
 
-prefix_ senf::FileHandle::FileHandle
-senf::FileHandle::cast_static(FileHandle handle)
+prefix_ senf::FileHandle senf::FileHandle::cast_static(FileHandle handle)
 {
     return handle;
 }
 
-prefix_ senf::FileHandle
-senf::FileHandle::cast_dynamic(FileHandle handle)
+prefix_ senf::FileHandle senf::FileHandle::cast_dynamic(FileHandle handle)
 {
     return handle;
 }
@@ -256,7 +257,7 @@ prefix_ int senf::retrieve_filehandle(FileHandle handle)
     return handle.fd();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f