[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/include deputy_no_annots.h, 1.2, 1.3 nesc_annots.h, 1.2, 1.3

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8484/include

Modified Files:
	deputy_no_annots.h nesc_annots.h 
Log Message:
annotation work

Index: deputy_no_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/deputy_no_annots.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deputy_no_annots.h	11 Feb 2008 21:17:04 -0000	1.2
--- deputy_no_annots.h	12 Feb 2008 21:16:00 -0000	1.3
***************
*** 2,8 ****
  #define __DEPUTY_COUNT(__n)                    
  #define __DEPUTY_SINGLE(__n)                   
! #define __DEPUTY_TRUSTED_CAST(__type,__expr)   
  
! #define TC(__type,__expr)                      
  
  #define __DEPUTY_NONNULL                       
--- 2,8 ----
  #define __DEPUTY_COUNT(__n)                    
  #define __DEPUTY_SINGLE(__n)                   
! #define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)(__expr))
  
! #define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)
  
  #define __DEPUTY_NONNULL                       

Index: nesc_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/nesc_annots.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nesc_annots.h	11 Feb 2008 20:46:38 -0000	1.2
--- nesc_annots.h	12 Feb 2008 21:16:00 -0000	1.3
***************
*** 2,3 ****
--- 2,4 ----
  struct @count @deputy_scope() @macro("__DEPUTY_COUNT") { int n; }; 
  struct @single @deputy_scope() @macro("__DEPUTY_SINGLE") { }; 
+ struct @nonnull @deputy_scope() @macro("__DEPUTY_NONNULL") { };