Index: trunk/IPs/systemC/Environment/Makefile.Environment
===================================================================
--- trunk/IPs/systemC/Environment/Makefile.Environment	(revision 82)
+++ trunk/IPs/systemC/Environment/Makefile.Environment	(revision 85)
@@ -51,15 +51,15 @@
 				@\
 				$(ECHO) "Compilation        : $*";\
-				$(DISTCXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
+				$(CXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
 
 $(DIR_OBJ)/%.o			: $(DIR_SRC)/%.c $(HEADERS)
 				@\
 				$(ECHO) "Compilation        : $*";\
-				$(DISTCC)  $(MORPHEO_CC_FLAGS)  -c -o $@ $<;
+				$(CC)  $(MORPHEO_CC_FLAGS)  -c -o $@ $<;
 
 $(DIR_OBJ)/%.o			: $(DIR_TST)/%.cpp $(HEADERS)
 				@\
 				$(ECHO) "Compilation        : $*";\
-				$(DISTCXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
+				$(CXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
 
 $(DIR_BIN)/%.x			: $(OBJECTS_DEPS) $(OBJECTS) $(OBJECTS_BIN)
Index: trunk/IPs/systemC/Environment/Queue/include/Queue.h
===================================================================
--- trunk/IPs/systemC/Environment/Queue/include/Queue.h	(revision 82)
+++ trunk/IPs/systemC/Environment/Queue/include/Queue.h	(revision 85)
@@ -61,13 +61,9 @@
       // *****[ pop ]*****
       // read the queue, and update the pointer
-    public : virtual T    pop  ()             = 0;
-
-      // *****[ pop ]*****
-      // read the queue, and update the pointer
-    public : virtual T    pop  (uint32_t num) = 0;
+    public : virtual T    pop  (uint32_t num=0) = 0;
 
       // *****[ push ]*****
       // Push a new value (they must have a slot free)
-    public : virtual bool push (T val)        = 0;
+    public : virtual bool push (T val)          = 0;
   
     }; // Queue
Index: trunk/IPs/systemC/Environment/Queue/include/Sort_Queue.h
===================================================================
--- trunk/IPs/systemC/Environment/Queue/include/Sort_Queue.h	(revision 82)
+++ trunk/IPs/systemC/Environment/Queue/include/Sort_Queue.h	(revision 85)
@@ -59,5 +59,5 @@
       // return the n-eme slot.
       // (first = 0)
-    public : slot_t<T> read (uint32_t num)
+    public : slot_t<T> read (uint32_t num=0)
       {
 	if (num >= Queue <T>::_nb_slot)
@@ -72,12 +72,5 @@
       // *****[ pop ]*****
       // read the queue, and update the pointer
-    public : T pop  ()
-      {
-	return pop (0);
-      }
-
-      // *****[ pop ]*****
-      // read the queue, and update the pointer
-    public : T pop  (uint32_t num)
+    public : T pop  (uint32_t num=0)
       {
 	if (num >= Queue <T>::_nb_slot)
Index: trunk/IPs/systemC/Environment/Queue/include/Sort_Queue_Dynamic.h
===================================================================
--- trunk/IPs/systemC/Environment/Queue/include/Sort_Queue_Dynamic.h	(revision 82)
+++ trunk/IPs/systemC/Environment/Queue/include/Sort_Queue_Dynamic.h	(revision 85)
@@ -107,5 +107,5 @@
       // return the n-eme slot.
       // (first = 0)
-    public : slot_t<T> read (uint32_t num)
+    public : slot_t<T> read (uint32_t num=0)
       {
 	if (num >= Queue <T>::_nb_slot)
@@ -120,12 +120,5 @@
       // *****[ pop ]*****
       // read the queue, and update the pointer
-    public : T pop  ()
-      {
-	return pop (0);
-      }
-
-      // *****[ pop ]*****
-      // read the queue, and update the pointer
-    public : T pop  (uint32_t num)
+    public : T pop  (uint32_t num=0)
       {
 	if (num >= Queue <T>::_nb_slot)