minor fixes for clang++

[senf.git] / senf / PPI / Connectors.cc

diff --git a/senf/PPI/Connectors.cc b/senf/PPI/Connectors.cc
index 1e3fb63..9fbddeb 100644 (file)
--- a/senf/PPI/Connectors.cc
+++ b/senf/PPI/Connectors.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 Connectors non-inline non-template implementation */
@@ -66,13 +71,14 @@ prefix_ void senf::ppi::connector::Connector::connect(Connector & target)
     SENF_ASSERT( ! target.peer_,
                  "senf::ppi::connector::Connector::connect(): (target) "
                  "duplicate connection" );
-    if (! (packetTypeID() == typeid(void) ||
-           target.packetTypeID() == typeid(void) ||
-           packetTypeID() == target.packetTypeID()) )
+
+    if (! (v_packetTypeId() == typeid(void) ||
+           target.v_packetTypeId() == typeid(void) ||
+           v_packetTypeId() == target.v_packetTypeId()) )
         throw IncompatibleConnectorsException()
-            << ": " << prettyName(packetTypeID())
+            << ": " << prettyName(v_packetTypeId())
             << " [in module " << prettyName(typeid(*module_))  << "] "
-            << ", " << prettyName(target.packetTypeID())
+            << ", " << prettyName(target.v_packetTypeId())
             << " [in module " << prettyName(typeid(*target.module_)) << "]";
 
     peer_ = & target;
@@ -198,7 +204,7 @@ prefix_ void senf::ppi::connector::Connector::disconnect()
     peer.v_disconnected();
 }
 
-prefix_ std::type_info const & senf::ppi::connector::Connector::packetTypeID()
+prefix_ std::type_info const & senf::ppi::connector::Connector::v_packetTypeId()
 {
     return typeid(void);
 }
@@ -358,19 +364,28 @@ prefix_ void senf::ppi::connector::ActiveConnector::unregisterRoute(ForwardingRo
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::connector::InputConnector
 
-prefix_ senf::Packet senf::ppi::connector::InputConnector::operator()()
+prefix_ senf::Packet const & senf::ppi::connector::InputConnector::operator()()
 {
+    static Packet nullPacket;
+
     if (empty())
         v_requestEvent();
-    if (! empty()) {
-        Packet p ( queue_.back());
+    if (fastPacket_) {
+        Packet const * p = fastPacket_;
+        fastPacket_ = NULL;
+        v_dequeueEvent();
+        SENF_PPI_TRACE(*p, "IN ");
+        return *p;
+    }
+    if (! queue_.empty()) {
+        slowPacket_ = queue_.back();
         queue_.pop_back();
         v_dequeueEvent();
-        SENF_PPI_TRACE(p, "IN ");
-        return p;
+        SENF_PPI_TRACE(slowPacket_, "IN ");
+        return slowPacket_;
     } else {
-        SENF_PPI_TRACE(Packet(), "IN ");
-        return Packet();
+        SENF_PPI_TRACE(nullPacket, "IN ");
+        return nullPacket;
     }
 }