decaldev-cvscommit

[<ha...@us...>]

Update of /cvsroot/decaldev/source/DecalFilters
In directory sc8-pr-cvs1:/tmp/cvs-serv10662

Modified Files:
	IdentifyQueue.cpp IdentifyQueue.h 
Log Message:
Maybe we'll have something that works before long

Index: IdentifyQueue.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/IdentifyQueue.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IdentifyQueue.cpp	1 Apr 2003 19:04:57 -0000	1.9
--- IdentifyQueue.cpp	1 Apr 2003 22:55:18 -0000	1.10
***************
*** 82,90 ****
  	if( !m_Queue.empty() )
  	{
! 		for( IDContainerIterator pDeque = m_Queue.begin(); pDeque != m_Queue.end(); pDeque++ )
          {
- 			//if( IsBadReadPtr( reinterpret_cast< void * >( *pDeque ), sizeof( IDStruct ) ) )
- 			//	continue;
- 
  			if ( (*pDeque)->lObjectID == lObjectID )
                  return S_OK;
--- 82,87 ----
  	if( !m_Queue.empty() )
  	{
! 		for( IDContainer::iterator pDeque = m_Queue.begin(); pDeque != m_Queue.end(); pDeque++ )
          {
  			if ( (*pDeque)->lObjectID == lObjectID )
                  return S_OK;
***************
*** 123,135 ****
  	
      
! 	for( IDContainerIterator pDeque = m_Queue.begin(); pDeque != m_Queue.end(); pDeque++ )
  	{
- 		//if( IsBadReadPtr( reinterpret_cast< void * >( *pDeque ), sizeof( IDStruct ) ) )
- 		//	continue;
- 
  		if ( (*pDeque)->lObjectID == lObjectID )
  		{
  			m_lAttempts = 0;
! 			m_Queue.erase( pDeque );
  			break;
  		}
--- 120,129 ----
  	
      
! 	for( IDContainer::iterator pDeque = m_Queue.begin(); pDeque != m_Queue.end(); pDeque++ )
  	{
  		if ( (*pDeque)->lObjectID == lObjectID )
  		{
  			m_lAttempts = 0;
! 			pDeque = m_Queue.erase( pDeque );
  			break;
  		}

Index: IdentifyQueue.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/IdentifyQueue.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IdentifyQueue.h	1 Apr 2003 19:04:57 -0000	1.3
--- IdentifyQueue.h	1 Apr 2003 22:55:18 -0000	1.4
***************
*** 44,56 ****
  
  private:
! 	CComPtr< IDecal >				m_pDecal;
! 	CComPtr< IACHooks >				m_pHooks;
      
!     typedef std::deque<IDStruct *> IDContainer;
!     typedef std::deque<IDStruct *>::iterator IDContainerIterator;
  
! 	IDContainer						m_Queue;
! 	bool							m_bWaiting;
! 	long							m_lAttempts;
      
      
--- 44,55 ----
  
  private:
! 	CComPtr< IDecal >					m_pDecal;
! 	CComPtr< IACHooks >					m_pHooks;
      
!     typedef std::deque< IDStruct * >	IDContainer;
  
! 	IDContainer							m_Queue;
! 	bool								m_bWaiting;
! 	long								m_lAttempts;