2009-10-12 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk rev 152672



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@152678 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 27 insertions, 9 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c81985de203..e68d69d86bb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,21 @@
+2009-10-10  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* doc/xml/manual/messages.xml: Update GNU gettext reference.
+
+2009-10-10  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* doc/xml/manual/codecvt.xml: Refer to The Open Group Base
+	Specifications, Issue 6 (IEEE Std. 1003.1-2004).
+	Update link to bogus site with reference to unix.org.
+	* doc/xml/manual/ctype.xml: Ditto.
+	* doc/xml/manual/locale.xml: Ditto.
+                                             
+2009-10-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/parallel/numeric (__adjacent_difference_switch): Fix typo.
+	* include/parallel/for_each_selectors.h
+	(__adjacent_difference_selector): Likewise.
+
 2009-10-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/ext/bitmap_allocator.h: Minor clean-ups.
diff --git a/libstdc++-v3/doc/xml/manual/codecvt.xml b/libstdc++-v3/doc/xml/manual/codecvt.xml
index 0b731f00464..a5a558965cf 100644
--- a/libstdc++-v3/doc/xml/manual/codecvt.xml
+++ b/libstdc++-v3/doc/xml/manual/codecvt.xml
@@ -600,7 +600,7 @@ codecvt usage.
 
   <biblioentry>
     <title>
-      System Interface Definitions, Issue 6 (IEEE Std. 1003.1-200x)
+      The Open Group Base Specifications, Issue 6 (IEEE Std. 1003.1-2004)
     </title>
 
     <copyright>
@@ -610,7 +610,7 @@ codecvt usage.
     </copyright>
 
     <biblioid>
-      <ulink url="http://www.opennc.org/austin/docreg.html">
+      <ulink url="http://www.unix.org/version3/ieee_std.html">
       </ulink>
     </biblioid>
 
diff --git a/libstdc++-v3/doc/xml/manual/ctype.xml b/libstdc++-v3/doc/xml/manual/ctype.xml
index 955dea90b4f..9a0a7ceaec7 100644
--- a/libstdc++-v3/doc/xml/manual/ctype.xml
+++ b/libstdc++-v3/doc/xml/manual/ctype.xml
@@ -182,7 +182,7 @@ characters.
 
   <biblioentry>
     <title>
-      System Interface Definitions, Issue 6 (IEEE Std. 1003.1-200x)
+      The Open Group Base Specifications, Issue 6 (IEEE Std. 1003.1-2004)
     </title>
 
     <copyright>
@@ -192,7 +192,7 @@ characters.
     </copyright>
 
     <biblioid>
-      <ulink url="http://www.opennc.org/austin/docreg.html">
+      <ulink url="http://www.unix.org/version3/ieee_std.html">
       </ulink>
     </biblioid>
 
diff --git a/libstdc++-v3/doc/xml/manual/locale.xml b/libstdc++-v3/doc/xml/manual/locale.xml
index 893e4711804..faf5e938560 100644
--- a/libstdc++-v3/doc/xml/manual/locale.xml
+++ b/libstdc++-v3/doc/xml/manual/locale.xml
@@ -575,7 +575,7 @@ global locale" (emphasis Paolo), that is:
 
   <biblioentry>
     <title>
-      System Interface Definitions, Issue 6 (IEEE Std. 1003.1-200x)
+      The Open Group Base Specifications, Issue 6 (IEEE Std. 1003.1-2004)
     </title>
 
     <copyright>
@@ -585,7 +585,7 @@ global locale" (emphasis Paolo), that is:
     </copyright>
 
     <biblioid>
-      <ulink url="http://www.opennc.org/austin/docreg.html">
+      <ulink url="http://www.unix.org/version3/ieee_std.html">
       </ulink>
     </biblioid>
 
diff --git a/libstdc++-v3/doc/xml/manual/messages.xml b/libstdc++-v3/doc/xml/manual/messages.xml
index c209ca7f018..2794030353c 100644
--- a/libstdc++-v3/doc/xml/manual/messages.xml
+++ b/libstdc++-v3/doc/xml/manual/messages.xml
@@ -594,7 +594,7 @@ java.util.Locale, java.util.ResourceBundle</pagenums>
 Library and Tools.
     </title>
     <biblioid>
-      <ulink url="http://sources.redhat.com/gettext">
+      <ulink url="http://www.gnu.org/software/gettext/">
       </ulink>
     </biblioid>
   </biblioentry> 
diff --git a/libstdc++-v3/include/parallel/for_each_selectors.h b/libstdc++-v3/include/parallel/for_each_selectors.h
index 092398de0f9..9fd432df021 100644
--- a/libstdc++-v3/include/parallel/for_each_selectors.h
+++ b/libstdc++-v3/include/parallel/for_each_selectors.h
@@ -277,7 +277,7 @@ namespace __gnu_parallel
         {
           typename _It::first_type __go_back_one = __i.first;
           --__go_back_one;
-          *__i.__second = __o(*__i.__first, *__go_back_one);
+          *__i.second = __o(*__i.first, *__go_back_one);
           return true;
         }
     };
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric
index 06985ba99c9..dc4c96761c8 100644
--- a/libstdc++-v3/include/parallel/numeric
+++ b/libstdc++-v3/include/parallel/numeric
@@ -435,7 +435,7 @@ __gnu_parallel::sequential_tag()); }
             __for_each_template_random_access_ed(
                 __begin_pair, __end_pair, __bin_op, __functionality,
                 __gnu_parallel::_DummyReduct(), __dummy, __dummy, -1);
-          return __functionality.finish_iterator;
+          return __functionality._M_finish_iterator;
         }
       else
         return adjacent_difference(__begin, __end, __result, __bin_op,