Update of /cvsroot/simspark/simspark/spark/zeitgeist/randomserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3342
Modified Files:
Tag: WIN32
randomserver.cpp randomserver.h
Log Message:
- move Seed() to randomserver.cpp. Prevent inclusion of windows.h in public randomserver header.
Index: randomserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/randomserver.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** randomserver.h 9 Feb 2007 16:16:51 -0000 1.1.2.1
--- randomserver.h 23 Feb 2007 19:18:02 -0000 1.1.2.2
***************
*** 27,34 ****
#include <zeitgeist/node.h>
- #ifndef WIN32
- #include <sys/time.h>
- #endif
-
namespace zeitgeist
{
--- 27,30 ----
***************
*** 47,60 ****
/** 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.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** randomserver.cpp 5 Dec 2005 21:05:01 -0000 1.1
--- randomserver.cpp 23 Feb 2007 19:18:01 -0000 1.1.2.1
***************
*** 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);
+ }
|
