libphidget-cvs-commits

[Jack S. <js...@us...>]

Update of /cvsroot/libphidget/libphidget/src/phidget++
In directory sc8-pr-cvs1:/tmp/cvs-serv24835

Modified Files:
	CUID.cc CUID.h 
Log Message:
Documentation


Index: CUID.cc
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CUID.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CUID.cc	16 Sep 2002 06:43:33 -0000	1.5
--- CUID.cc	21 Dec 2002 04:02:23 -0000	1.6
***************
*** 49,53 ****
  {
  	METHOD_GUARD;
!     (*this) = id;
  	METHOD_UNGUARD;
  }
--- 49,53 ----
  {
  	METHOD_GUARD;
! 	(*this) = id;
  	METHOD_UNGUARD;
  }
***************
*** 56,63 ****
  {
  	METHOD_GUARD;
!     _serial = id._serial;
!     _id = id._id;
  
!     return (*this);
  	METHOD_UNGUARD;
  }
--- 56,63 ----
  {
  	METHOD_GUARD;
! 	_serial = id._serial;
! 	_id = id._id;
  
! 	return (*this);
  	METHOD_UNGUARD;
  }
***************
*** 66,74 ****
  {
  	METHOD_GUARD;
! 	 if (_serial != id._serial)
! 	     return (false);
! 	 if (_id != id._id)
! 	     return (false);
! 	 return (true);
  	METHOD_UNGUARD;
  }
--- 66,77 ----
  {
  	METHOD_GUARD;
! 
! 	if (_serial != id._serial)
! 		return (false);
! 
! 	if (_id != id._id)
! 		return (false);
! 
! 	return (true);
  	METHOD_UNGUARD;
  }
***************
*** 83,87 ****
  {
  	METHOD_GUARD;
!  return (_serial);
  	METHOD_UNGUARD;
  }
--- 86,90 ----
  {
  	METHOD_GUARD;
! 	return (_serial);
  	METHOD_UNGUARD;
  }
***************
*** 90,94 ****
  {
  	METHOD_GUARD;
!  return (_id);
  	METHOD_UNGUARD;
  }
--- 93,97 ----
  {
  	METHOD_GUARD;
! 	return (_id);
  	METHOD_UNGUARD;
  }
***************
*** 98,106 ****
  {
  	METHOD_GUARD;
!  if (_serial < id._serial)
!      return (true);
!  if (_serial > id._serial)
!      return (false);
!  return (_id < id._id);
  	METHOD_UNGUARD;
  }
--- 101,113 ----
  {
  	METHOD_GUARD;
! 
! 	if (_serial < id._serial)
! 		return (true);
! 
! 	if (_serial > id._serial)
! 		return (false);
! 
! 	return (_id < id._id);
! 
  	METHOD_UNGUARD;
  }
***************
*** 109,117 ****
  {
  	METHOD_GUARD;
!  if (_serial < id._serial)
!      return (false);
!  if (_serial > id._serial)
!      return (true);
!  return (_id > id._id);
  	METHOD_UNGUARD;
  }
--- 116,128 ----
  {
  	METHOD_GUARD;
! 
! 	if (_serial < id._serial)
! 		return (false);
! 
! 	if (_serial > id._serial)
! 		return (true);
! 
! 	return (_id > id._id);
! 
  	METHOD_UNGUARD;
  }
***************
*** 120,131 ****
  {
  	METHOD_GUARD;
!  char temp[16];
  
!  if  (_id == -1)
! 	 sprintf(temp, "%d", _serial);
!  else
! 	 sprintf(temp, "%d:%d", _serial, _id);
  
-      return (string(temp));
  	METHOD_UNGUARD;
  }
--- 131,143 ----
  {
  	METHOD_GUARD;
! 	char temp[16];
  
! 	if  (_id == -1)
! 		sprintf(temp, "%d", _serial);
! 	else
! 		sprintf(temp, "%d:%d", _serial, _id);
! 
! 	return (string(temp));
  
  	METHOD_UNGUARD;
  }

Index: CUID.h
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CUID.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CUID.h	17 Dec 2002 23:39:16 -0000	1.6
--- CUID.h	21 Dec 2002 04:02:23 -0000	1.7
***************
*** 32,35 ****
--- 32,39 ----
  
  	public:
+ 
+ 	/**
+ 	 * Default constructor, this won't be a valid UID.
+ 	 */
  	CUID ();
  
***************
*** 37,41 ****
  	 * Initialize a CUID for a phidget device
  	 */
! 	CUID (const int serial	//!< The serial number of the phidget
  		);
  
--- 41,46 ----
  	 * Initialize a CUID for a phidget device
  	 */
! 	CUID (
! 		const int serial      //!< The serial number of the phidget
  		);
  
***************
*** 43,47 ****
  	 * Initialize a CUID for a phidget device
  	 */
! 	CUID (const int serial,	//!< The serial number of the phidget
  	  	const int id);
  
--- 48,53 ----
  	 * Initialize a CUID for a phidget device
  	 */
! 	CUID (
! 		const int serial,     //!< The serial number of the phidget
  	  	const int id);
  
***************
*** 50,55 ****
  	 * Intialize a CUID for a device attached to a phidget
  	 */
! 	CUID (const CUniqueDevice *device,	//!< The phidget that controls this device
! 	  	const int id		//!< The id for the device attached to this phidget
  		);
  
--- 56,62 ----
  	 * Intialize a CUID for a device attached to a phidget
  	 */
! 	CUID (
! 		const CUniqueDevice *device,   //!< The phidget that controls this device
! 	  	const int id                   //!< The id for the device attached to this phidget
  		);
  
***************
*** 59,62 ****
--- 66,72 ----
  	CUID (const CUID &id);
  
+ 	/**
+ 	 * Standard destructor
+ 	 */
  	virtual ~CUID();