generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-12-31 07:09:37 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: isNil() / isNull() / tryParse()

Browse Source
This commit is contained in:
Marian Krivos
2011-08-22 18:10:20 +00:00
parent dc7d9a88b3
commit 8d10f9532e
2 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Foundation/src/UUIDGenerator.cpp
View File

@@ -1,7 +1,7 @@
//
// UUIDGenerator.cpp
//
// $Id: //poco/1.3/Foundation/src/UUIDGenerator.cpp#4 $
// $Id: //poco/1.4/Foundation/src/UUIDGenerator.cpp#1 $
//
// Library: Foundation
// Package: UUID
@@ -88,7 +88,11 @@ UUID UUIDGenerator::createFromName(const UUID& nsid, const std::string& name, Di
UUID netNsid = nsid;
netNsid.toNetwork();
de.reset();
de.update(&netNsid, sizeof(netNsid));
de.update(&netNsid._timeLow, sizeof(netNsid._timeLow));
de.update(&netNsid._timeMid, sizeof(netNsid._timeMid));
de.update(&netNsid._timeHiAndVersion, sizeof(netNsid._timeHiAndVersion));
de.update(&netNsid._clockSeq, sizeof(netNsid._clockSeq));
de.update(&netNsid._node[0], sizeof(netNsid._node));
de.update(name);
char buffer[16];
const DigestEngine::Digest& d = de.digest();
@@ -145,9 +149,14 @@ UUID UUIDGenerator::createOne()
}
UUIDGenerator& UUIDGenerator::defaultGenerator()
namespace
{
static SingletonHolder<UUIDGenerator> sh;
}
UUIDGenerator& UUIDGenerator::defaultGenerator()
{
return *sh.get();
}