diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-02-03 08:33:35 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-02-03 08:33:35 +0000 |
| commit | be76a59f6afa441ea5c873878754e3761375882f (patch) | |
| tree | 4264ebe14baa753dfe7bce5162291197d3170447 | |
| parent | 073197227cb998f0506011facad1b20d6e470aa5 (diff) | |
| download | gcc-be76a59f6afa441ea5c873878754e3761375882f.zip gcc-be76a59f6afa441ea5c873878754e3761375882f.tar.gz gcc-be76a59f6afa441ea5c873878754e3761375882f.tar.bz2 | |
stl_threads.h (struct _STL_mutex_lock): Same.
2001-02-03 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/stl_threads.h (struct _STL_mutex_lock): Same.
* include/bits/localefwd.h: More initialization cleanups.
From-SVN: r39428
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/localefwd.h | 12 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_threads.h | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6b919d9..72c6928 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,9 @@ -Fri Feb 2 15:47:51 2001 Jeffrey A Law (law@cygnus.com) +2001-02-03 Benjamin Kosnik <bkoz@redhat.com> + + * include/bits/stl_threads.h (struct _STL_mutex_lock): Same. + * include/bits/localefwd.h: More initialization cleanups. + +2001-02-03 Jeffrey A Law <law@cygnus.com> * include/bits/ios_base.h (_S_ios_fmtflags_end): Initialize correctly targets with 16bit ints. diff --git a/libstdc++-v3/include/bits/localefwd.h b/libstdc++-v3/include/bits/localefwd.h index cafa045..73b987a 100644 --- a/libstdc++-v3/include/bits/localefwd.h +++ b/libstdc++-v3/include/bits/localefwd.h @@ -228,12 +228,12 @@ namespace std // Category values: // NB: Order must match _S_facet_categories definition in locale.cc static const category none = 0; - static const category ctype = 1 << 0; - static const category numeric = 1 << 1; - static const category collate = 1 << 2; - static const category time = 1 << 3; - static const category monetary = 1 << 4; - static const category messages = 1 << 5; + static const category ctype = 1L << 0; + static const category numeric = 1L << 1; + static const category collate = 1L << 2; + static const category time = 1L << 3; + static const category monetary = 1L << 4; + static const category messages = 1L << 5; static const category all = (collate | ctype | monetary | numeric | time | messages); diff --git a/libstdc++-v3/include/bits/stl_threads.h b/libstdc++-v3/include/bits/stl_threads.h index 5f5b451..b897a0e 100644 --- a/libstdc++-v3/include/bits/stl_threads.h +++ b/libstdc++-v3/include/bits/stl_threads.h @@ -246,7 +246,7 @@ struct _STL_mutex_lock struct timespec __ts; /* Max sleep is 2**27nsec ~ 60msec */ __ts.tv_sec = 0; - __ts.tv_nsec = 1 << __log_nsec; + __ts.tv_nsec = 1L << __log_nsec; nanosleep(&__ts, 0); # elif defined(__STL_WIN32THREADS) if (__log_nsec <= 20) { |