diff options
Diffstat (limited to 'libcilkrts/include/cilk/cilk.h')
| -rw-r--r-- | libcilkrts/include/cilk/cilk.h | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/libcilkrts/include/cilk/cilk.h b/libcilkrts/include/cilk/cilk.h index 2d0de0d293e..86038ac1adc 100644 --- a/libcilkrts/include/cilk/cilk.h +++ b/libcilkrts/include/cilk/cilk.h @@ -1,10 +1,8 @@ /* cilk.h -*-C++-*- * - * @copyright - * Copyright (C) 2010-2013, Intel Corporation + * Copyright (C) 2010-2016, Intel Corporation * All rights reserved. * - * @copyright * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -19,7 +17,6 @@ * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * @copyright * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -32,40 +29,54 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * ********************************************************************* + * + * PLEASE NOTE: This file is a downstream copy of a file mainitained in + * a repository at cilkplus.org. Changes made to this file that are not + * submitted through the contribution process detailed at + * http://www.cilkplus.org/submit-cilk-contribution will be lost the next + * time that a new version is released. Changes only submitted to the + * GNU compiler collection or posted to the git repository at + * https://bitbucket.org/intelcilkruntime/intel-cilk-runtime.git are + * not tracked. + * + * We welcome your contributions to this open source project. Thank you + * for your assistance in helping us improve Cilk Plus. */ /** @file cilk.h * - * @brief Provides convenient aliases for the Cilk language keywords. + * @brief Provides convenient aliases for Intel(R) Cilk(TM) language keywords. * * @details - * Since Cilk is a nonstandard extension to both C and C++, the Cilk - * language keywords all begin with “`_Cilk_`”, which guarantees that they + * Since Intel Cilk Plus is a nonstandard extension to both C and C++, the Intel + * Cilk language keywords all begin with "`_Cilk_`", which guarantees that they * will not conflict with user-defined identifiers in properly written - * programs, so that “standard” C and C++ programs can safely be - * compiled a Cilk-enabled C or C++ compiler. + * programs. This way, a Cilk-enabled C or C++ compiler can safely compile + * "standard" C and C++ programs. * * However, this means that the keywords _look_ like something grafted on to * the base language. Therefore, you can include this header: * * #include "cilk/cilk.h" * - * and then write the Cilk keywords with a “`cilk_`” prefix instead of - * “`_Cilk_`”. + * and then write the Intel Cilk keywords with a "`cilk_`" prefix instead of + * "`_Cilk_`". * * @ingroup language */ /** @defgroup language Language Keywords - * Definitions having to do with the Cilk language. + * Definitions for the Intel Cilk language. * @{ */ #ifndef cilk_spawn # define cilk_spawn _Cilk_spawn ///< Spawn a task that can execute in parallel. # define cilk_sync _Cilk_sync ///< Wait for spawned tasks to complete. -# define cilk_for _Cilk_for ///< Execute iterations of a for loop in parallel. +# define cilk_for _Cilk_for ///< Execute iterations of a `for` loop in parallel. #endif /// @} |