cleaned the hierarchy of serialization classes

libretroshare/src/pqi/p3servicecontrol.cc

@@ -27,6 +27,7 @@
 
 #include "p3servicecontrol.h"
 #include "rsitems/rsserviceids.h"
+#include "rsitems/rsitem.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rsbaseserial.h"
 #include "pqi/p3cfgmgr.h"

libretroshare/src/pqi/pqi.h

@@ -27,8 +27,7 @@
 #ifndef PQI_TOP_HEADER
 #define PQI_TOP_HEADER
 
-#include "serialiser/rsserial.h"
-
+#include "rsitems/rsitem.h"
 
 class P3Interface
 {

libretroshare/src/pqi/pqiqos.cc

@@ -11,7 +11,9 @@ const uint32_t pqiQoS::MAX_PACKET_COUNTER_VALUE = (1 << 24) ;
 pqiQoS::pqiQoS(uint32_t nb_levels,float alpha)
 	: _item_queues(nb_levels),_alpha(alpha)
 {
+#ifdef DEBUG
 	assert(pow(alpha,nb_levels) < 1e+20) ;
+#endif
 
 	float c = 1.0f ;
 	float inc = alpha ;
@@ -110,7 +112,9 @@ void *pqiQoS::out_rsItem(uint32_t max_slice_size, uint32_t& size, bool& starts,
 
 	if(last >= 0)
 	{
+#ifdef DEBUG
 		assert(_nb_items > 0) ;
+#endif
         
         	// now chop a slice of this item
         

libretroshare/src/pqi/pqistore.cc

@@ -40,6 +40,7 @@
  *
  */
 
+#include "rsitems/rsitem.h"
 #include "pqi/pqistore.h"
 #include "serialiser/rsserial.h"
 #include <iostream>