2011-04-28 Paolo Carlini <paolo.carlini@oracle.com>

[gcc.git] / libstdc++-v3 / include / parallel / par_loop.h

diff --git a/libstdc++-v3/include/parallel/par_loop.h b/libstdc++-v3/include/parallel/par_loop.h
index f0a463ebba5ade1f9b4dacbb77ae61c4cbd0d35d..9671c1dd398a5de012f4ee99ea39ffb04d4ff577 100644 (file)
--- a/libstdc++-v3/include/parallel/par_loop.h
+++ b/libstdc++-v3/include/parallel/par_loop.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 terms
@@ -75,29 +75,28 @@ namespace __gnu_parallel
       _Result *__thread_results;
       bool* __constructed;
 
-      _ThreadIndex __num_threads =
-       __gnu_parallel::min<_DifferenceType>(__get_max_threads(), __length);
+      _ThreadIndex __num_threads = __gnu_parallel::min<_DifferenceType>
+       (__get_max_threads(), __length);
 
 #     pragma omp parallel num_threads(__num_threads)
       {
 #       pragma omp single
        {
          __num_threads = omp_get_num_threads();
-         __thread_results =
-           static_cast<_Result*>(::operator new(__num_threads
-                                                * sizeof(_Result)));
+         __thread_results = static_cast<_Result*>
+           (::operator new(__num_threads * sizeof(_Result)));
          __constructed = new bool[__num_threads];
        }
 
        _ThreadIndex __iam = omp_get_thread_num();
 
        // Neutral element.
-       _Result* __reduct =
-         static_cast<_Result*>(::operator new(sizeof(_Result)));
+       _Result* __reduct = static_cast<_Result*>
+         (::operator new(sizeof(_Result)));
 
        _DifferenceType
-         __start = equally_split_point(__length, __num_threads, __iam),
-         __stop = equally_split_point(__length, __num_threads, __iam + 1);
+         __start = __equally_split_point(__length, __num_threads, __iam),
+         __stop = __equally_split_point(__length, __num_threads, __iam + 1);
 
        if (__start < __stop)
          {