[Cppfcplib] r14156 - trunk/apps/CppFCPLib

[mkolar at freenetproject.org]

Author: mkolar
Date: 2007-07-16 11:06:06 +0000 (Mon, 16 Jul 2007)
New Revision: 14156

Modified:
   trunk/apps/CppFCPLib/FCPResult.h
   trunk/apps/CppFCPLib/main.cpp
Log:
bug in VectorConverter and VectorWithoutLastConverter

Modified: trunk/apps/CppFCPLib/FCPResult.h
===================================================================
--- trunk/apps/CppFCPLib/FCPResult.h	2007-07-16 10:46:15 UTC (rev 14155)
+++ trunk/apps/CppFCPLib/FCPResult.h	2007-07-16 11:06:06 UTC (rev 14156)
@@ -53,11 +53,6 @@
 
 ///////////
 
-Message::Ptr
-getMessage(ServerMessage::Ptr sm) {
-  return Message::Ptr( sm->getMessage() );
-}
-
 struct MessageConverter {
   Message::Ptr
   operator()( Response &resp )
@@ -79,7 +74,10 @@
   operator()( Response &resp )
   {
     std::vector<Message::Ptr> ret = std::vector<Message::Ptr>( resp.responses.size() );
-    std::transform(resp.responses.begin(), resp.responses.end(), ret.begin(), getMessage);
+    for ( std::vector<ServerMessage::Ptr>::iterator it = resp.responses.begin();
+          it != resp.responses.end();
+          ++it )
+      ret.push_back( Message::Ptr( (*it)->getMessage() ) );
     return ret;
   }
 };
@@ -88,9 +86,12 @@
   std::vector<Message::Ptr>
   operator()( Response &resp )
   {
-    int numToCopy = resp.responses.size();
+    int numToCopy = resp.responses.size() - 1;
     std::vector<Message::Ptr> ret = std::vector<Message::Ptr>( numToCopy );
-    std::transform(resp.responses.begin(), resp.responses.begin() + numToCopy, ret.begin(), getMessage);
+    for ( std::vector<ServerMessage::Ptr>::iterator it = resp.responses.begin();
+          it != resp.responses.begin() + numToCopy;
+          ++it )
+      ret.push_back( Message::Ptr( (*it)->getMessage() ) );
     return ret;
   }
 };

Modified: trunk/apps/CppFCPLib/main.cpp
===================================================================
--- trunk/apps/CppFCPLib/main.cpp	2007-07-16 10:46:15 UTC (rev 14155)
+++ trunk/apps/CppFCPLib/main.cpp	2007-07-16 11:06:06 UTC (rev 14156)
@@ -10,7 +10,7 @@
   FCPLib::Message::Ptr m = n.getNode();
   std::cout << m->toString() ;
 
-  getchar ();
+  getchar();
 
   ///testDDA
 //  Node n("123", "", -1);