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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6b919d9994af4ff3f058ec5490da2b873ebda8c1..72c692802664558f06928613ec836e62046d660d 100644 (file)
--- 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 cafa045b4105646697f8d536f45c1c511a7ffbd1..73b987a924371fdc1d676f5a3c15488c2c5573ab 100644 (file)
--- 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 5f5b451e3d1cc71c0af724d2402e0664ec63345d..b897a0ea277196fd6bb9570e19f5cc45262f7ff9 100644 (file)
--- 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) {