diff options
| author | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-31 14:52:19 +0000 |
|---|---|---|
| committer | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-31 14:52:19 +0000 |
| commit | b31856d3ac23cf3dab1e95cb96230dc81564c84a (patch) | |
| tree | 49524df297e69390449c3ef5037b2360d14c7b1a /libstdc++-v3/src/c++11/thread.cc | |
| parent | 1ade4d1864f2cf61eb5c045f57c0bcac80943c04 (diff) | |
| parent | a168a775e93ec31ae743ad282d8e60fa1c116891 (diff) | |
| download | gcc-b31856d3ac23cf3dab1e95cb96230dc81564c84a.tar.gz | |
Merged trunk revision 250739 into the hsa branch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/hsa@250744 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/c++11/thread.cc')
| -rw-r--r-- | libstdc++-v3/src/c++11/thread.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc index 4a94bdd2f8c..cd6d9fe6635 100644 --- a/libstdc++-v3/src/c++11/thread.cc +++ b/libstdc++-v3/src/c++11/thread.cc @@ -180,12 +180,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __n; } -_GLIBCXX_END_NAMESPACE_VERSION - namespace this_thread { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - void __sleep_for(chrono::seconds __s, chrono::nanoseconds __ns) { @@ -217,10 +213,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ::Sleep(chrono::milliseconds(__s).count() + ms); #endif } - -_GLIBCXX_END_NAMESPACE_VERSION } +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 |