diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-06-18 13:00:04 -0700 |
|---|---|---|
| committer | Pavel Chupin <pavel.v.chupin@intel.com> | 2014-06-19 22:38:42 +0400 |
| commit | f190d6284359da8ae8694b2d2e14b01602a959ed (patch) | |
| tree | d4e0548e7cec02d60b1082368032e66a1c509a02 /gcc-4.8/libstdc++-v3/src | |
| parent | 4ff2f42147bc128ce38789071d98e55844cd3a5e (diff) | |
| download | toolchain_gcc-f190d6284359da8ae8694b2d2e14b01602a959ed.tar.gz toolchain_gcc-f190d6284359da8ae8694b2d2e14b01602a959ed.tar.bz2 toolchain_gcc-f190d6284359da8ae8694b2d2e14b01602a959ed.zip | |
Merge GCC 4.8.3
Change-Id: I0abe59f7705b3eccc6b2f123af75b2e30917696a
Diffstat (limited to 'gcc-4.8/libstdc++-v3/src')
| -rw-r--r-- | gcc-4.8/libstdc++-v3/src/c++11/thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.8/libstdc++-v3/src/c++11/thread.cc b/gcc-4.8/libstdc++-v3/src/c++11/thread.cc index 8d040a729..0351f19e0 100644 --- a/gcc-4.8/libstdc++-v3/src/c++11/thread.cc +++ b/gcc-4.8/libstdc++-v3/src/c++11/thread.cc @@ -183,7 +183,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ::usleep(__us); } # else - ::sleep(__s.count() + (__ns >= 1000000)); + ::sleep(__s.count() + (__ns.count() >= 1000000)); # endif #elif defined(_GLIBCXX_HAVE_WIN32_SLEEP) unsigned long ms = __ns.count() / 1000000; |