2004-06-30 Brad Spencer <spencer@infointeractive.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / numeric

diff --git a/libstdc++-v3/include/ext/numeric b/libstdc++-v3/include/ext/numeric
index 5b33a89..8879be4 100644 (file)
--- a/libstdc++-v3/include/ext/numeric
+++ b/libstdc++-v3/include/ext/numeric
@@ -1,6 +1,6 @@
 // Numeric extensions -*- C++ -*-
 
-// Copyright (C) 2002 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -53,10 +53,17 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
+/** @file ext/numeric
+ *  This file is a GNU extension to the Standard C++ Library (possibly
+ *  containing extensions from the HP/SGI STL subset).  You should only
+ *  include this header if you are using GCC 3 or later.
+ */
+
 #ifndef _EXT_NUMERIC
-#define _EXT_NUMERIC
+#define _EXT_NUMERIC 1
 
 #pragma GCC system_header
+
 #include <bits/concept_check.h>
 #include <numeric>
 
@@ -66,29 +73,31 @@ namespace __gnu_cxx
 {
   // Returns __x ** __n, where __n >= 0.  _Note that "multiplication"
   // is required to be associative, but not necessarily commutative.
-   
   template<typename _Tp, typename _Integer, typename _MonoidOperation>
     _Tp
     __power(_Tp __x, _Integer __n, _MonoidOperation __monoid_op)
     {
       if (__n == 0)
        return identity_element(__monoid_op);
-      else {
-       while ((__n & 1) == 0) {
+      else
+       {
+         while ((__n & 1) == 0)
+           {
+             __n >>= 1;
+             __x = __monoid_op(__x, __x);
+           }
+
+         _Tp __result = __x;
          __n >>= 1;
-         __x = __monoid_op(__x, __x);
+         while (__n != 0)
+           {
+             __x = __monoid_op(__x, __x);
+             if ((__n & 1) != 0)
+               __result = __monoid_op(__result, __x);
+             __n >>= 1;
+           }
+         return __result;
        }
-
-       _Tp __result = __x;
-       __n >>= 1;
-       while (__n != 0) {
-         __x = __monoid_op(__x, __x);
-         if ((__n & 1) != 0)
-           __result = __monoid_op(__result, __x);
-         __n >>= 1;
-       }
-       return __result;
-      }
     }
 
   template<typename _Tp, typename _Integer>
@@ -96,35 +105,47 @@ namespace __gnu_cxx
     __power(_Tp __x, _Integer __n)
     { return __power(__x, __n, std::multiplies<_Tp>()); }
 
+  /**
+   *  This is an SGI extension.
+   *  @ingroup SGIextensions
+   *  @doctodo
+  */
   // Alias for the internal name __power.  Note that power is an extension,
   // not part of the C++ standard.
-
   template<typename _Tp, typename _Integer, typename _MonoidOperation>
     inline _Tp
     power(_Tp __x, _Integer __n, _MonoidOperation __monoid_op)
     { return __power(__x, __n, __monoid_op); }
 
+  /**
+   *  This is an SGI extension.
+   *  @ingroup SGIextensions
+   *  @doctodo
+  */
   template<typename _Tp, typename _Integer>
     inline _Tp
     power(_Tp __x, _Integer __n)
     { return __power(__x, __n); }
 
+  /**
+   *  This is an SGI extension.
+   *  @ingroup SGIextensions
+   *  @doctodo
+  */
   // iota is not part of the C++ standard.  It is an extension.
-
   template<typename _ForwardIter, typename _Tp>
-    void 
+    void
     iota(_ForwardIter __first, _ForwardIter __last, _Tp __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
-      __glibcpp_function_requires(_ConvertibleConcept<_Tp,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
+      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
            typename std::iterator_traits<_ForwardIter>::value_type>)
 
       while (__first != __last)
        *__first++ = __value++;
     }
-
 } // namespace __gnu_cxx
 
-#endif /* _EXT_NUMERIC */
+#endif