[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/collection Queue.nc, 1.1.2.1, 1.1.2.2 QueueC.nc, 1.1.2.1, 1.1.2.2

[Kyle Jamieson]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19442

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Queue.nc QueueC.nc 
Log Message:
Changed Queue methods push and pop to enqueue and dequeue, respectively.

Index: Queue.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/Attic/Queue.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Queue.nc	21 Apr 2006 00:47:21 -0000	1.1.2.1
--- Queue.nc	1 May 2006 16:43:07 -0000	1.1.2.2
***************
*** 25,28 ****
--- 25,29 ----
  /*
   *  @author Philip Levis
+  *  @author Kyle Jamieson
   *  @date   $Date$
   */
***************
*** 36,40 ****
  
    command t head();
!   command t pop();
!   command error_t push(t newVal);
  }
--- 37,41 ----
  
    command t head();
!   command t dequeue();
!   command error_t enqueue(t newVal);
  }

Index: QueueC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/Attic/QueueC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** QueueC.nc	21 Apr 2006 00:47:21 -0000	1.1.2.1
--- QueueC.nc	1 May 2006 16:43:07 -0000	1.1.2.2
***************
*** 29,33 ****
  
     
! generic module QueueC(uint8_t QUEUE_SIZE, typedef queue_type) {
    provides {
      interface Queue<t>;
--- 29,33 ----
  
     
! generic module QueueC(typedef queue_type, uint8_t QUEUE_SIZE) {
    provides {
      interface Queue<t>;
***************
*** 58,62 ****
    }
  
!   command queue_type Queue.pop() {
      queue_type t = call Queue.head();
      if (!Queue.empty()) {
--- 58,62 ----
    }
  
!   command queue_type Queue.dequeue() {
      queue_type t = call Queue.head();
      if (!Queue.empty()) {
***************
*** 68,72 ****
    }
  
!   command error_t Queue.push(queue_type newVal) {
      if (Queue.size() < Queue.maxSize()) {
        queue[tail] = newVal;
--- 68,72 ----
    }
  
!   command error_t Queue.enqueue(queue_type newVal) {
      if (Queue.size() < Queue.maxSize()) {
        queue[tail] = newVal;