[simspark-cvs] simspark/spark/zeitgeist/randomserver randomserver.cpp, 1.1, 1.2 randomserver.h, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/randomserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/zeitgeist/randomserver

Modified Files:
	randomserver.cpp randomserver.h 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: randomserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/randomserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** randomserver.h	5 Dec 2005 21:05:01 -0000	1.1
--- randomserver.h	15 Mar 2007 07:26:31 -0000	1.2
***************
*** 26,30 ****
  #include <salt/random.h>
  #include <zeitgeist/node.h>
- #include <sys/time.h>
  
  namespace zeitgeist
--- 26,29 ----
***************
*** 44,57 ****
  
      /** set a random seed */
!     void Seed(salt::RandomEngine::result_type seed)
!     {
!         if (seed == 0)
!         {
!             timeval tv;
!             gettimeofday(&tv,0);
!             seed = tv.tv_usec;
!         }
!         salt::RandomEngine::instance(seed);
!     }
  
      /** get a uniformly distributed random number */
--- 43,47 ----
  
      /** set a random seed */
!     void Seed(salt::RandomEngine::result_type seed);
  
      /** get a uniformly distributed random number */

Index: randomserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/randomserver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** randomserver.cpp	5 Dec 2005 21:05:01 -0000	1.1
--- randomserver.cpp	15 Mar 2007 07:26:31 -0000	1.2
***************
*** 22,32 ****
  */
  #include "randomserver.h"
- #include <cmath>
  
! #if 0
  void
  RandomServer::Seed(salt::RandomEngine::result_type seed)
  {
!     salt::RandomEngine.instance(seed);
! }
  #endif
--- 22,50 ----
  */
  #include "randomserver.h"
  
! #ifdef WIN32
! #include <windows.h>
! #else
! #include <sys/time.h>
! #endif
! 
! using namespace zeitgeist;
! 
  void
  RandomServer::Seed(salt::RandomEngine::result_type seed)
  {
!     if (seed == 0)
!         {
! #ifdef WIN32
!             SYSTEMTIME time;
!             GetSystemTime(&time);
!             seed = time.wMilliseconds;
! #else
!             timeval tv;
!             gettimeofday(&tv,0);
!             seed = tv.tv_usec;
  #endif
+         }
+ 
+     salt::RandomEngine::instance(seed);
+ }