Fix compilation error: ISO C++ forbids use of initializer list to initialize reference assocTuple

2010-03-18 11:39:24 +00:00
parent 6f76706fb9
commit 14e174bf7b
1 changed files with 6 additions and 2 deletions
--- a/src/routing/olsr/olsr-routing-protocol.cc
+++ b/src/routing/olsr/olsr-routing-protocol.cc
@@ -1412,8 +1412,12 @@ RoutingProtocol::ProcessHna (const olsr::MessageHeader &msg,
      //          A_time         =  current time + validity time
      else
        {
-          const AssociationTuple &assocTuple = (AssociationTuple){msg.GetOriginatorAddress(),it->address,it->mask,now + msg.GetVTime ()};
-          
+          AssociationTuple assocTuple = {
+            msg.GetOriginatorAddress(),
+            it->address,
+            it->mask,
+            now + msg.GetVTime ()
+          };
          AddAssociationTuple (assocTuple);
          
          //Schedule Association Tuple deletion