diff options
Diffstat (limited to '')
-rw-r--r-- | libgamma-error.cc (renamed from src/libgamma-error.cc) | 22 | ||||
-rw-r--r-- | libgamma-error.hh (renamed from src/libgamma-error.hh) | 22 | ||||
-rw-r--r-- | libgamma-facade.cc (renamed from src/libgamma-facade.cc) | 18 | ||||
-rw-r--r-- | libgamma-facade.hh (renamed from src/libgamma-facade.hh) | 22 | ||||
-rw-r--r-- | libgamma-method.cc (renamed from src/libgamma-method.cc) | 22 | ||||
-rw-r--r-- | libgamma-method.hh (renamed from src/libgamma-method.hh) | 28 | ||||
-rw-r--r-- | src/libgamma-native.hh | 42 | ||||
-rw-r--r-- | src/libgamma.hh | 28 | ||||
-rw-r--r-- | test.cc (renamed from src/test.cc) | 18 |
9 files changed, 20 insertions, 202 deletions
diff --git a/src/libgamma-error.cc b/libgamma-error.cc index 1d5caaa..db66bbe 100644 --- a/src/libgamma-error.cc +++ b/libgamma-error.cc @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "libgamma-error.hh" #include <iostream> @@ -76,7 +60,7 @@ namespace libgamma } -#ifdef __GCC__ +#ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wshadow" #endif @@ -111,7 +95,7 @@ namespace libgamma return strerror(this->error_code); } -#ifdef __GCC__ +#ifdef __GNUC__ # pragma GCC diagnostic pop #endif diff --git a/src/libgamma-error.hh b/libgamma-error.hh index feb3e04..5f65e86 100644 --- a/src/libgamma-error.hh +++ b/libgamma-error.hh @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #ifndef LIBGAMMA_ERROR_HH #define LIBGAMMA_ERROR_HH @@ -25,7 +9,7 @@ #include "libgamma-native.hh" -#ifndef __GCC__ +#ifndef __GNUC__ # define __attribute__(X) /* emtpy */ #endif @@ -185,7 +169,7 @@ namespace libgamma } -#ifndef __GCC__ +#ifndef __GNUC__ # undef __attribute__ #endif diff --git a/src/libgamma-facade.cc b/libgamma-facade.cc index bd6ee28..9d74d6f 100644 --- a/src/libgamma-facade.cc +++ b/libgamma-facade.cc @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "libgamma-facade.hh" #include "libgamma-error.hh" diff --git a/src/libgamma-facade.hh b/libgamma-facade.hh index a2e235e..3ac3321 100644 --- a/src/libgamma-facade.hh +++ b/libgamma-facade.hh @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #ifndef LIBGAMMA_FACADE_HH #define LIBGAMMA_FACADE_HH @@ -26,7 +10,7 @@ #include "libgamma-method.hh" -#ifndef __GCC__ +#ifndef __GNUC__ # define __attribute__(X) /* emtpy */ #endif @@ -259,7 +243,7 @@ namespace libgamma } -#ifndef __GCC__ +#ifndef __GNUC__ # undef __attribute__ #endif diff --git a/src/libgamma-method.cc b/libgamma-method.cc index dae9929..79230f2 100644 --- a/src/libgamma-method.cc +++ b/libgamma-method.cc @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "libgamma-method.hh" #include "libgamma-error.hh" @@ -332,7 +316,7 @@ namespace libgamma return *this; } -#ifdef __GCC__ +#ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wshadow" #endif @@ -543,7 +527,7 @@ namespace libgamma return r != 0; } -#ifdef __GCC__ +#ifdef __GNUC__ # pragma GCC diagnostic pop #endif diff --git a/src/libgamma-method.hh b/libgamma-method.hh index 1ad8be5..43b4983 100644 --- a/src/libgamma-method.hh +++ b/libgamma-method.hh @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #ifndef LIBGAMMA_METHOD_HH #define LIBGAMMA_METHOD_HH @@ -26,7 +10,7 @@ #include "libgamma-error.hh" -#ifndef __GCC__ +#ifndef __GNUC__ # define __attribute__(X) /* emtpy */ #endif @@ -108,7 +92,7 @@ namespace libgamma /** * Destructor. */ - ~MethodCapabilities() __attribute__((const)); + ~MethodCapabilities(); /** * Copy operator. @@ -504,7 +488,7 @@ namespace libgamma -#ifdef __GCC__ +#ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Weffc++" /* Lets ignore that we do not override the copy constructor @@ -1007,14 +991,14 @@ namespace libgamma }; -#ifdef __GCC__ +#ifdef __GNUC__ # pragma GCC diagnostic pop #endif } -#ifndef __GCC__ +#ifndef __GNUC__ # undef __attribute__ #endif diff --git a/src/libgamma-native.hh b/src/libgamma-native.hh deleted file mode 100644 index be86743..0000000 --- a/src/libgamma-native.hh +++ /dev/null @@ -1,42 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef LIBGAMMA_NATIVE_HH -#define LIBGAMMA_NATIVE_HH - - -extern "C" -{ -# ifdef __GCC__ -# define restrict __restrict__ -# else -# define restrict /* remove */ -# endif -# define this self -# include <libgamma.h> -# undef this -# undef restrict -# ifndef __GCC__ -# ifdef __attribute__ -# undef __attribute__ -# endif -# endif -} - - -#endif - diff --git a/src/libgamma.hh b/src/libgamma.hh deleted file mode 100644 index 2a2666c..0000000 --- a/src/libgamma.hh +++ /dev/null @@ -1,28 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef LIBGAMMA_HH -#define LIBGAMMA_HH - - -#include "libgamma-error.hh" -#include "libgamma-method.hh" -#include "libgamma-facade.hh" - - -#endif - @@ -1,20 +1,4 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "libgamma.hh" #include <iostream> |