aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Wayne Zhang <qiwzhang@gmail.com>2017-05-30 11:18:23 -0700
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2017-05-30 11:18:23 -0700
commitd6470abef1ca76c40e6da3b4445b7c32f1d0e2e3 (patch)
treea2a485e4791be487efc822a6ea6f3297536a973c
parente222997c5bb136b4f079d5fdb1c9852bfadb2b3a (diff)
not to use std::random_device for map.Seed(). (#3133)
* not to use std::random_device for map.Seed(). * remove include random
-rw-r--r--src/google/protobuf/map.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index 18ee3652..e5a32c5c 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -47,9 +47,6 @@
#include <google/protobuf/generated_enum_util.h>
#include <google/protobuf/map_type_handler.h>
#include <google/protobuf/stubs/hash.h>
-#if __cpp_exceptions && LANG_CXX11
-#include <random>
-#endif
namespace google {
namespace protobuf {
@@ -922,16 +919,6 @@ class Map {
// Return a randomish value.
size_type Seed() const {
- // random_device can throw, so avoid it unless we are compiling with
- // exceptions enabled.
-#if __cpp_exceptions && LANG_CXX11
- try {
- std::random_device rd;
- std::knuth_b knuth(rd());
- std::uniform_int_distribution<size_type> u;
- return u(knuth);
- } catch (...) { }
-#endif
size_type s = static_cast<size_type>(reinterpret_cast<uintptr_t>(this));
#if defined(__x86_64__) && defined(__GNUC__)
uint32 hi, lo;