diff options
Diffstat (limited to 'libcilkrts/runtime/except-gcc.cpp')
| -rw-r--r-- | libcilkrts/runtime/except-gcc.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libcilkrts/runtime/except-gcc.cpp b/libcilkrts/runtime/except-gcc.cpp index bd08d1826b3..4940acb41f7 100644 --- a/libcilkrts/runtime/except-gcc.cpp +++ b/libcilkrts/runtime/except-gcc.cpp @@ -2,11 +2,9 @@ * ************************************************************************* * - * @copyright - * Copyright (C) 2009-2013, Intel Corporation + * Copyright (C) 2009-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: @@ -21,7 +19,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 @@ -34,6 +31,20 @@ * 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. **************************************************************************/ #include "except-gcc.h" @@ -100,12 +111,12 @@ static void decode_exceptions(char *out, size_t len, struct pending_exception_info *info) { if (info->empty()) - snprintf(out, len, "[empty]"); + cilk_snprintf_s(out, len, "%s", "[empty]"); else if (info->rethrow) - snprintf(out, len, "[rethrow %p]", - info->runtime_state.caughtExceptions); + cilk_snprintf_l(out, len, "[rethrow %p]", + info->runtime_state.caughtExceptions); else - snprintf(out, len, "[throw %p]", (void *)info->active); + cilk_snprintf_l(out, len, "[throw %p]", (void *)info->active); } #endif |