X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a794f606622c7904c33cd6c2b1d769c185d1f81b..4634214e18b847f6346048fa12179d3d99ae82c9:/include/xbt/ex.h diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 78ade076cc..dc6596c7a3 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -1,54 +1,17 @@ -/* Copyright (c) 2005-2017. The SimGrid Team. - * All rights reserved. */ - -/* Copyright (c) 2002-2004 Ralf S. Engelschall */ -/* Copyright (c) 2002-2004 The OSSP Project */ -/* Copyright (c) 2002-2004 Cable & Wireless */ -/* All rights reserved. */ - -/* This code is inspirated from the OSSP version (as retrieved back in 2004)*/ -/* It was heavily modified to fit the SimGrid framework. */ - -/* The OSSP version has the following copyright notice: -** OSSP ex - Exception Handling -** Copyright (c) 2002-2004 Ralf S. Engelschall -** Copyright (c) 2002-2004 The OSSP Project -** Copyright (c) 2002-2004 Cable & Wireless -** -** This file is part of OSSP ex, an exception handling library -** which can be found at http://www.ossp.org/pkg/lib/ex/. -** -** Permission to use, copy, modify, and distribute this software for -** any purpose with or without fee is hereby granted, provided that -** the above copyright notice and this permission notice appear in all -** copies. -** -** THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESSED OR IMPLIED -** WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -** USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. - */ +/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved. */ -/* The extensions made for the SimGrid project can either be distributed */ -/* under the same license, or under the LGPL v2.1 */ +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef XBT_EX_H #define XBT_EX_H #include -#include "xbt/base.h" -#include "xbt/sysdep.h" -#include "xbt/misc.h" -#include "xbt/virtu.h" +#include +#include +#include +#include /** @addtogroup XBT_ex_c * @brief Exceptions support (C) @@ -87,13 +50,13 @@ SG_BEGIN_DECL() /** Get the name of a category * @ingroup XBT_ex_c */ -XBT_PUBLIC(const char *) xbt_ex_catname(xbt_errcat_t cat); +XBT_PUBLIC const char* xbt_ex_catname(xbt_errcat_t cat); typedef struct xbt_ex xbt_ex_t; /** Helper function used to throw exceptions in C */ -XBT_ATTRIB_NORETURN XBT_PUBLIC(void) - _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, int line, const char* func); +XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, + int line, const char* func); /** Builds and throws an exception * @ingroup XBT_ex_c @@ -131,7 +94,7 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC(void) #define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)") /** Display an exception */ -XBT_PUBLIC(void) xbt_ex_display(xbt_ex_t * e); +XBT_PUBLIC void xbt_ex_display(xbt_ex_t* e); SG_END_DECL()