Explorar o código

2010-01-24 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed compile error with intel compiler
	* src/XmlRpcMethodImpl.cc
	* src/XmlRpcMethodImpl.h
Tatsuhiro Tsujikawa %!s(int64=15) %!d(string=hai) anos
pai
achega
46605f66c3
Modificáronse 3 ficheiros con 16 adicións e 13 borrados
  1. 6 0
      ChangeLog
  2. 0 12
      src/XmlRpcMethodImpl.cc
  3. 10 1
      src/XmlRpcMethodImpl.h

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2010-01-24  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed compile error with intel compiler
+	* src/XmlRpcMethodImpl.cc
+	* src/XmlRpcMethodImpl.h
+
 2010-01-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Release 1.8.1

+ 0 - 12
src/XmlRpcMethodImpl.cc

@@ -608,18 +608,6 @@ BDE TellActiveXmlRpcMethod::process
   return list;
 }
 
-template<typename T>
-void AbstractPaginationXmlRpcMethod<T>::checkPaginationParams
-(const BDE& params) const
-{
-  assert(params.isList());
-  if(params.size() != 2 ||
-     !params[0].isInteger() || !params[1].isInteger() ||
-     params[1].i() < 0) {
-    throw DL_ABORT_EX("Invalid argument. Specify offset and num in integer.");
-  }
-}
-
 const std::deque<SharedHandle<RequestGroup> >&
 TellWaitingXmlRpcMethod::getItems(DownloadEngine* e) const
 {

+ 10 - 1
src/XmlRpcMethodImpl.h

@@ -37,6 +37,7 @@
 
 #include "XmlRpcMethod.h"
 
+#include <cassert>
 #include <deque>
 #include <algorithm>
 
@@ -201,7 +202,15 @@ private:
     return std::make_pair(first, last);
   }
 
-  void checkPaginationParams(const BDE& params) const;
+  void checkPaginationParams(const BDE& params) const
+  {
+    assert(params.isList());
+    if(params.size() != 2 ||
+       !params[0].isInteger() || !params[1].isInteger() ||
+       params[1].i() < 0) {
+      throw DL_ABORT_EX("Invalid argument. Specify offset and num in integer.");
+    }
+  }
 protected:
   virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e)
   {