projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1694393: save 'pref.*' keys first, so the window manager hint preference is loade...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
guid.cpp
diff --git
a/synfig-core/trunk/src/synfig/guid.cpp
b/synfig-core/trunk/src/synfig/guid.cpp
index
bf23475
..
a2a4ac4
100644
(file)
--- a/
synfig-core/trunk/src/synfig/guid.cpp
+++ b/
synfig-core/trunk/src/synfig/guid.cpp
@@
-2,7
+2,7
@@
/*! \file guid.cpp
** \brief Template File
**
/*! \file guid.cpp
** \brief Template File
**
-** $Id
: guid.cpp,v 1.4 2005/01/13 06:48:39 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-87,12
+87,12
@@
public:
{
next=x;
}
{
next=x;
}
-
+
unsigned long i32()
{
static const unsigned long a(1664525);
static const unsigned long c(1013904223);
unsigned long i32()
{
static const unsigned long a(1664525);
static const unsigned long c(1013904223);
-
+
return next=next*a+c;
}
return next=next*a+c;
}
@@
-104,10
+104,10
@@
public:
float f()
{
static const float m(int(65535));
float f()
{
static const float m(int(65535));
-
+
return float(i16())/m;
}
return float(i16())/m;
}
-
+
unsigned long operator()(const unsigned long& m)
{
if(m==65536)
unsigned long operator()(const unsigned long& m)
{
if(m==65536)
@@
-146,10
+146,10
@@
static void _get_rand_long_long(uint64_t &x)
{
//subtractive_rng _c(clock());
unsigned short* data(reinterpret_cast<unsigned short *>(&x));
{
//subtractive_rng _c(clock());
unsigned short* data(reinterpret_cast<unsigned short *>(&x));
- data[0]=_a(65536);
- data[1]=_a(65536);
- data[2]=_a(65536);
- data[3]=_a(65536);
+ data[0]=_a(65536);
+ data[1]=_a(65536);
+ data[2]=_a(65536);
+ data[3]=_a(65536);
}
#else
}
#else
@@
-160,7
+160,7
@@
static void _get_rand_long_long(uint64_t &x)
static void get_rand_long_long(uint64_t &x)
{
_GUID* guid(reinterpret_cast<_GUID*>(&x));
static void get_rand_long_long(uint64_t &x)
{
_GUID* guid(reinterpret_cast<_GUID*>(&x));
- CoCreateGuid(guid);
+ CoCreateGuid(guid);
}
#else
}
#else
@@
-195,7
+195,7
@@
synfig::GUID::make_unique()
synfig::GUID
synfig::GUID::hasher(const String& str)
synfig::GUID
synfig::GUID::hasher(const String& str)
-{
+{
#ifdef HASH_MAP_H
hash<const char*> string_hash_;
const unsigned int seed(
#ifdef HASH_MAP_H
hash<const char*> string_hash_;
const unsigned int seed(
@@
-211,7
+211,7
@@
synfig::GUID::hasher(const String& str)
seed=(seed>>(32-(i%24)))^(seed<<(i%24))
}
#endif
seed=(seed>>(32-(i%24)))^(seed<<(i%24))
}
#endif
-
+
GUID_RNG random(seed);
GUID ret(0);
ret.data.u_32.a=random(~(unsigned int)0);
GUID_RNG random(seed);
GUID ret(0);
ret.data.u_32.a=random(~(unsigned int)0);