A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_hash.cpp
diff --git
a/src/mc/mc_hash.cpp
b/src/mc/mc_hash.cpp
index
7a0249d
..
fff7d69
100644
(file)
--- a/
src/mc/mc_hash.cpp
+++ b/
src/mc/mc_hash.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-8,9
+7,12
@@
#include <cstdint>
#include <cstdint>
-#include "mc_private.h"
+#include "xbt/log.h"
+
#include "mc/datatypes.h"
#include "mc/datatypes.h"
-#include "mc_hash.hpp"
+#include "src/mc/mc_hash.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
#include <mc/mc.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
#include <mc/mc.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
@@
-21,12
+23,13
@@
namespace mc {
namespace {
class djb_hash {
namespace {
class djb_hash {
- hash_type state_ = 5381ll;
+ hash_type state_ = 5381LL;
+
public:
template<class T>
void update(T& x)
{
public:
template<class T>
void update(T& x)
{
- state_ = (state_ << 5) + state_ +
(std::uint64_t) value
;
+ state_ = (state_ << 5) + state_ +
state_
;
}
hash_type value()
{
}
hash_type value()
{