[Once-cvs] oncecode/src/server/content ocsrvcontentmgr.cpp,1.11,1.12 ocsrvcontentmgr.h,1.8,1.9

[Cirilo B. <pin...@us...>]

Update of /cvsroot/once/oncecode/src/server/content
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29546/src/server/content

Modified Files:
	ocsrvcontentmgr.cpp ocsrvcontentmgr.h 
Log Message:
A few (minor) changes to keep an AMD64 happy

Index: ocsrvcontentmgr.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/content/ocsrvcontentmgr.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ocsrvcontentmgr.cpp	4 Jul 2005 23:45:39 -0000	1.11
--- ocsrvcontentmgr.cpp	7 Jul 2005 03:31:40 -0000	1.12
***************
*** 211,215 ****
  {
  	OCTRACE("ocServerContentMgr::AddPlayerToFile");
! 	ocSentContentFile* sent_file = sent_files.Get((unsigned int)file, (ocSentContentFile*) 0);
  
  	if (!sent_file) 
--- 211,215 ----
  {
  	OCTRACE("ocServerContentMgr::AddPlayerToFile");
! 	ocSentContentFile* sent_file = sent_files.Get((unsigned long)file, (ocSentContentFile*) 0L);
  
  	if (!sent_file) 
***************
*** 225,229 ****
  void ocServerContentMgr::RemoveConnection(PlayerID* player)
  {
! 	csHash<ocSentContentFile*, unsigned int>::GlobalIterator it = sent_files.GetIterator();
  	
  	while (it.HasNext())
--- 225,229 ----
  void ocServerContentMgr::RemoveConnection(PlayerID* player)
  {
! 	csHash<ocSentContentFile*, unsigned long>::GlobalIterator it = sent_files.GetIterator();
  	
  	while (it.HasNext())
***************
*** 247,251 ****
  	sent_something = false;
  
! 	csHash<ocSentContentFile*, unsigned int>::GlobalIterator it =
  		sent_files.GetIterator();
  
--- 247,251 ----
  	sent_something = false;
  
! 	csHash<ocSentContentFile*, unsigned long>::GlobalIterator it =
  		sent_files.GetIterator();
  
***************
*** 399,403 ****
    
  	/* The file must no longer be sent */
! 	sent_files.DeleteAll((unsigned int)file);
  
  	//	outdated_files.Add(file);
--- 399,403 ----
    
  	/* The file must no longer be sent */
! 	sent_files.DeleteAll((unsigned long)file);
  
  	//	outdated_files.Add(file);

Index: ocsrvcontentmgr.h
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/content/ocsrvcontentmgr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ocsrvcontentmgr.h	17 Jun 2005 01:54:24 -0000	1.8
--- ocsrvcontentmgr.h	7 Jul 2005 03:31:40 -0000	1.9
***************
*** 138,142 ****
   private:
    /** Contains all the files currently being sent */
!   csHash<ocSentContentFile*, unsigned int> sent_files;
    /** maximum transfer id currently allocated */
    uint32 max_transferid;
--- 138,142 ----
   private:
    /** Contains all the files currently being sent */
!   csHash<ocSentContentFile*, unsigned long> sent_files;
    /** maximum transfer id currently allocated */
    uint32 max_transferid;