diff --git a/Makefile.am b/Makefile.am index dcafc7c..97e06de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,11 +73,11 @@ CLEANFILES = ACLOCAL_AMFLAGS = -I m4 install_macros = \ - m4/sgpemv2-dirs.m4 \ - m4/sgpemv2-visibility.m4 + m4/sgpemv2-dirs.m4 macros = \ m4/compilerflags.m4 \ - m4/linkingflags.m4 + m4/linkingflags.m4 \ + m4/sgpemv2-visibility.m4 distro_files = \ distro/deb/control-file-v1.0 \ @@ -85,7 +85,14 @@ distro_files = \ distro/deb/readme.txt \ distro/ebuild/sgpemv2-1.0.ebuild \ distro/rpm/SPECS/sgpemv2-1.0.spec \ - distro/rpm/readme.txt + distro/rpm/readme.txt \ + distro/win32/pyloader.vcproj \ + distro/win32/sgpemv2.vcproj \ + distro/win32/backend.vcproj \ + distro/win32/config/config.h \ + distro/win32/xmlsave.vcproj \ + distro/win32/sgpemv2.sln \ + distro/win32/_sgpem.vcproj EXTRA_DIST += \ config/config.rpath \ @@ -260,8 +267,9 @@ src_backend_libbackend_la_SOURCES = \ # Put here header files that will be installed for the user # For headers used internally by the backend, see below. +# Please note that the first listed header is generated by +# configure. pkginclude_HEADERS += \ - config.h \ src/backend/sgpemv2/cpu_policies_gatekeeper.hh \ src/backend/sgpemv2/cpu_policy.hh \ src/backend/sgpemv2/cpu_policy_exception.hh \ @@ -299,6 +307,7 @@ pkginclude_HEADERS += \ src/backend/sgpemv2/serializer.hh \ src/backend/sgpemv2/serializer_error.hh \ src/backend/sgpemv2/serializers_gatekeeper.hh \ + src/backend/sgpemv2/sgpemv2-visibility.hh \ src/backend/sgpemv2/simulation.hh \ src/backend/sgpemv2/simulation_observer.hh \ src/backend/sgpemv2/simulation_statistics.hh \ diff --git a/configure.ac b/configure.ac index 8618e06..3e2ab7a 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,11 @@ AC_CANONICAL_TARGET dnl starting automake AM_INIT_AUTOMAKE([dejagnu dist-bzip2 subdir-objects]) +dnl HACK to avoid multiple definition of macros when +dnl including spgemv2-config.h (autoheader generated) +AH_TOP([#if not defined PACKAGE]) +AH_BOTTOM([#endif]) + dnl gettext & libtool AC_PROG_LIBTOOL AM_GNU_GETTEXT([external]) @@ -61,6 +66,7 @@ AC_CHECK_CXXFLAG([CXXFLAGS], [Wall]) AC_CHECK_CXXFLAG([CXXFLAGS], [pedantic]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wextra]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-long-long]) +AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) AC_CHECK_LDFLAG([LDFLAGS],[--as-needed]) dnl see if we've to enable debug flags @@ -107,9 +113,6 @@ PKG_CHECK_MODULES([LIBGLADEMM], [libglademm-2.4 >= $LIBGLADEMM_VERSION], :, AC_MSG_ERROR([$LIBGLADEMM_PKG_ERRORS])) -dnl use DSO visibility tags for systems that supports it correctly -SGPEMV2_VISIBILITY_SUPPORT - dnl check for Doxygen AC_CHECK_PROG([HAVE_DOXYGEN],[doxygen],[yes]) AC_CHECK_PROG([HAVE_DOT],[dot], [yes]) @@ -129,6 +132,8 @@ dnl output files AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc config/sgpemv2-uninstalled.pc]) AC_CONFIG_HEADERS([config.h:config.h.in]) +# force include of configuration header in every compilation unit +CPPFLAGS="${CPPFLAGS} -include config.h" dnl configure plugin directories dnl TODO: make this conditional diff --git a/m4/sgpemv2-visibility.m4 b/m4/sgpemv2-visibility.m4 deleted file mode 100644 index a77366f..0000000 --- a/m4/sgpemv2-visibility.m4 +++ /dev/null @@ -1,87 +0,0 @@ -dnl m4/sgpemv2-visibility.m4 - Copyright 2005, 2006, University -dnl of Padova, dept. of Pure and Applied -dnl Mathematics -dnl -dnl This file is part of SGPEMv2. -dnl -dnl This is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl SGPEMv2 is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with SGPEMv2; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -dnl ---------- AC_PROG_SGPEMV2 --------------------- -dnl -dnl Synopsis: AC_PROG_SGPEMV2([min_version]) -dnl -dnl This macro enables the new DSO visibility -dnl support for compilers that supports it, defining -dnl the following preprocessor macros: -dnl SG_DLLEXPORT : for objects exported by the DSO -dnl SG_DLLIMPORT : for objects imported by the DSO -dnl SG_DLLLOCAL : for objects local to the DSO -dnl SG_DLLPUBLIC : for objects public outside the DSO -dnl -dnl Example of usage: SGPEMV2_VISIBILITY_SUPPORT -dnl ------------------------------------------------ -AC_DEFUN([SGPEMV2_VISIBILITY_SUPPORT], -[ - -dnl use DSO visibility tags for systems that supports it correctly -dnl (for example, GCC 4.0 and above) -dnl see http://gcc.gnu.org/wiki/Visibility for more informations -AH_TEMPLATE([SG_DLLEXPORT],[Attribute for objects to be exported from DSOs]) -AH_TEMPLATE([SG_DLLIMPORT],[Attribute for objects to be imported from DSOs]) -AH_TEMPLATE([SG_DLLLOCAL], [Attribute for objects local to current DSO]) -AH_TEMPLATE([SG_DLLPUBLIC],[Attribute for DSO public objects]) - -AC_ARG_ENABLE([visibility-support], - AS_HELP_STRING([--disable-visibility-support], - [disable the new GCC visibility support]), - [enable_gcc_visibility="$enableval"], - [enable_gcc_visibility="yes"]) -AC_MSG_CHECKING([whether to use new GCC visibility attributes]) - -dnl for now it works only with GCC >= 4.0.0 -AC_LANG_PUSH([C++]) -if test "x$enable_gcc_visibility" = "xyes"; then - AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([], [ - #if defined __GNUC__ && (__GNUC__) >= 4 - return 0; - #else - bails out with a compilation error. - #endif - ]), - :, - [enable_gcc_visibility="no"]) -fi -AC_LANG_POP - -if test "x$enable_gcc_visibility" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([SG_DLLIMPORT],[/* intentionally left with no value */]) - AC_DEFINE([SG_DLLEXPORT],[__attribute__ ((visibility("default")))]) - AC_DEFINE([SG_DLLLOCAL],[__attribute__ ((visibility("hidden")))]) - AC_DEFINE([SG_DLLPUBLIC],[__attribute__ ((visibility("default")))]) - - AC_CHECK_CXXFLAG([VISIB_HIDDEN], [fvisibility=hidden]) - AC_SUBST([VISIB_HIDDEN]) - AC_CHECK_CXXFLAG([CXXFLAGS],[fvisibility-inlines-hidden]) -else - AC_MSG_RESULT([no]) - AC_DEFINE([SG_DLLIMPORT],[/* unsupported */]) - AC_DEFINE([SG_DLLEXPORT],[/* unsupported */]) - AC_DEFINE([SG_DLLLOCAL],[/* unsupported */]) - AC_DEFINE([SG_DLLPUBLIC],[/* unsupported */]) -fi -])dnl ------- SGPEMV2_VISIBILITY_SUPPORT --------------------- - diff --git a/plugins/pyloader/configure.ac b/plugins/pyloader/configure.ac index 9b78c15..4511ecb 100644 --- a/plugins/pyloader/configure.ac +++ b/plugins/pyloader/configure.ac @@ -61,6 +61,7 @@ AC_CHECK_CXXFLAG([CXXFLAGS], [Wall]) AC_CHECK_CXXFLAG([CXXFLAGS], [pedantic]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wextra]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-long-long]) +AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) AC_CHECK_LDFLAG([LDFLAGS], [--as-needed]) dnl see if we've to enable debug flags @@ -112,9 +113,6 @@ PKG_CHECK_MODULES([GLIBMM], [glibmm-2.4 >= $GTKMM_VERSION], :, AC_MSG_ERROR([$GLIBMM_PKG_ERRORS])) -dnl use DSO visibility tags for systems that supports it correctly -SGPEMV2_VISIBILITY_SUPPORT - dnl see if we've to compile tests AC_MSG_CHECKING([whether tests have to be built]) AC_ARG_ENABLE([tests], diff --git a/plugins/pyloader/m4/sgpemv2-visibility.m4 b/plugins/pyloader/m4/sgpemv2-visibility.m4 deleted file mode 100644 index 7220795..0000000 --- a/plugins/pyloader/m4/sgpemv2-visibility.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl m4/sgpemv2-visibility.m4 - Copyright 2005, 2006, University -dnl of Padova, dept. of Pure and Applied -dnl Mathematics -dnl -dnl This file is part of SGPEMv2. -dnl -dnl This is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl SGPEMv2 is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with SGPEMv2; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -dnl ---------- AC_PROG_SGPEMV2 --------------------- -dnl -dnl Synopsis: AC_PROG_SGPEMV2([min_version]) -dnl -dnl This macro enables the new DSO visibility -dnl support for compilers that supports it, defining -dnl the following preprocessor macros: -dnl SG_DLLEXPORT : for objects exported by the DSO -dnl SG_DLLIMPORT : for objects imported by the DSO -dnl SG_DLLLOCAL : for objects local to the DSO -dnl SG_DLLPUBLIC : for objects public outside the DSO -dnl -dnl Example of usage: SGPEMV2_VISIBILITY_SUPPORT -dnl ------------------------------------------------ -AC_DEFUN([SGPEMV2_VISIBILITY_SUPPORT], -[ - -dnl use DSO visibility tags for systems that supports it correctly -dnl (for example, GCC 4.0 and above) -dnl see http://gcc.gnu.org/wiki/Visibility for more informations -AH_TEMPLATE([SG_DLLEXPORT],[Attribute for objects to be exported from DSOs]) -AH_TEMPLATE([SG_DLLIMPORT],[Attribute for objects to be imported from DSOs]) -AH_TEMPLATE([SG_DLLLOCAL], [Attribute for objects local to current DSO]) -AH_TEMPLATE([SG_DLLPUBLIC],[Attribute for DSO public objects]) - -AC_ARG_ENABLE([visibility-support], - AS_HELP_STRING([--disable-visibility-support], - [disable the new GCC visibility support]), - [enable_gcc_visibility="$enableval"], - [enable_gcc_visibility="yes"]) -AC_MSG_CHECKING([whether to use new GCC visibility attributes]) - -dnl for now it works only with GCC >= 4.0.0 -AC_LANG_PUSH([C++]) -if test "x$enable_gcc_visibility" = "xyes"; then - AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([], [ - #if defined __GNUC__ && (__GNUC__) >= 4 - return 0; - #else - bails out with a compilation error. - #endif - ]), - :, - [enable_gcc_visibility="no"]) -fi -AC_LANG_POP - -if test "x$enable_gcc_visibility" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([SG_DLLIMPORT],[/* intentionally left with no value */]) - AC_DEFINE([SG_DLLEXPORT],[__attribute__ ((visibility("default")))]) - AC_DEFINE([SG_DLLLOCAL],[__attribute__ ((visibility("hidden")))]) - AC_DEFINE([SG_DLLPUBLIC],[__attribute__ ((visibility("default")))]) - - AC_CHECK_CXXFLAG([VISIB_HIDDEN], [fvisibility=hidden]) - AC_SUBST([VISIB_HIDDEN]) - AC_CHECK_CXXFLAG([CXXFLAGS],[fvisibility-inlines-hidden]) -else - AC_MSG_RESULT([no]) - AC_DEFINE([SG_DLLIMPORT],[/* unsupported */]) - AC_DEFINE([SG_DLLEXPORT],[/* unsupported */]) - AC_DEFINE([SG_DLLLOCAL],[/* unsupported */]) - AC_DEFINE([SG_DLLPUBLIC],[/* unsupported */]) -fi - -])dnl ------- SGPEMV2_VISIBILITY_SUPPORT --------------------- - diff --git a/plugins/xmlsave/Makefile.am b/plugins/xmlsave/Makefile.am index 4123e75..717e3e6 100644 --- a/plugins/xmlsave/Makefile.am +++ b/plugins/xmlsave/Makefile.am @@ -50,8 +50,7 @@ ACLOCAL_AMFLAGS = -I m4 macros = m4/compilerflags.m4 \ m4/linkingflags.m4 \ - m4/sgpemv2-dirs.m4 \ - m4/sgpemv2-visibility.m4 + m4/sgpemv2-dirs.m4 EXTRA_DIST += \ config/config.rpath \ diff --git a/plugins/xmlsave/configure.ac b/plugins/xmlsave/configure.ac index 5ca4c09..8f1a0aa 100644 --- a/plugins/xmlsave/configure.ac +++ b/plugins/xmlsave/configure.ac @@ -61,6 +61,7 @@ AC_CHECK_CXXFLAG([CXXFLAGS], [Wall]) AC_CHECK_CXXFLAG([CXXFLAGS], [pedantic]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wextra]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-long-long]) +AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) AC_CHECK_LDFLAG([LDFLAGS], [--as-needed]) dnl see if we've to enable debug flags @@ -110,9 +111,6 @@ PKG_CHECK_MODULES([LIBXML2], :, AC_MSG_ERROR([$LIBXML2_PKG_ERRORS])) -dnl use DSO visibility tags for systems that supports it correctly -SGPEMV2_VISIBILITY_SUPPORT - dnl see if we've to compile tests AC_MSG_CHECKING([whether tests have to be built]) AC_ARG_ENABLE([tests], diff --git a/plugins/xmlsave/m4/sgpemv2-visibility.m4 b/plugins/xmlsave/m4/sgpemv2-visibility.m4 deleted file mode 100644 index 7220795..0000000 --- a/plugins/xmlsave/m4/sgpemv2-visibility.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl m4/sgpemv2-visibility.m4 - Copyright 2005, 2006, University -dnl of Padova, dept. of Pure and Applied -dnl Mathematics -dnl -dnl This file is part of SGPEMv2. -dnl -dnl This is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl SGPEMv2 is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with SGPEMv2; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -dnl ---------- AC_PROG_SGPEMV2 --------------------- -dnl -dnl Synopsis: AC_PROG_SGPEMV2([min_version]) -dnl -dnl This macro enables the new DSO visibility -dnl support for compilers that supports it, defining -dnl the following preprocessor macros: -dnl SG_DLLEXPORT : for objects exported by the DSO -dnl SG_DLLIMPORT : for objects imported by the DSO -dnl SG_DLLLOCAL : for objects local to the DSO -dnl SG_DLLPUBLIC : for objects public outside the DSO -dnl -dnl Example of usage: SGPEMV2_VISIBILITY_SUPPORT -dnl ------------------------------------------------ -AC_DEFUN([SGPEMV2_VISIBILITY_SUPPORT], -[ - -dnl use DSO visibility tags for systems that supports it correctly -dnl (for example, GCC 4.0 and above) -dnl see http://gcc.gnu.org/wiki/Visibility for more informations -AH_TEMPLATE([SG_DLLEXPORT],[Attribute for objects to be exported from DSOs]) -AH_TEMPLATE([SG_DLLIMPORT],[Attribute for objects to be imported from DSOs]) -AH_TEMPLATE([SG_DLLLOCAL], [Attribute for objects local to current DSO]) -AH_TEMPLATE([SG_DLLPUBLIC],[Attribute for DSO public objects]) - -AC_ARG_ENABLE([visibility-support], - AS_HELP_STRING([--disable-visibility-support], - [disable the new GCC visibility support]), - [enable_gcc_visibility="$enableval"], - [enable_gcc_visibility="yes"]) -AC_MSG_CHECKING([whether to use new GCC visibility attributes]) - -dnl for now it works only with GCC >= 4.0.0 -AC_LANG_PUSH([C++]) -if test "x$enable_gcc_visibility" = "xyes"; then - AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([], [ - #if defined __GNUC__ && (__GNUC__) >= 4 - return 0; - #else - bails out with a compilation error. - #endif - ]), - :, - [enable_gcc_visibility="no"]) -fi -AC_LANG_POP - -if test "x$enable_gcc_visibility" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([SG_DLLIMPORT],[/* intentionally left with no value */]) - AC_DEFINE([SG_DLLEXPORT],[__attribute__ ((visibility("default")))]) - AC_DEFINE([SG_DLLLOCAL],[__attribute__ ((visibility("hidden")))]) - AC_DEFINE([SG_DLLPUBLIC],[__attribute__ ((visibility("default")))]) - - AC_CHECK_CXXFLAG([VISIB_HIDDEN], [fvisibility=hidden]) - AC_SUBST([VISIB_HIDDEN]) - AC_CHECK_CXXFLAG([CXXFLAGS],[fvisibility-inlines-hidden]) -else - AC_MSG_RESULT([no]) - AC_DEFINE([SG_DLLIMPORT],[/* unsupported */]) - AC_DEFINE([SG_DLLEXPORT],[/* unsupported */]) - AC_DEFINE([SG_DLLLOCAL],[/* unsupported */]) - AC_DEFINE([SG_DLLPUBLIC],[/* unsupported */]) -fi - -])dnl ------- SGPEMV2_VISIBILITY_SUPPORT --------------------- - diff --git a/src/add_request_dialog.hh b/src/add_request_dialog.hh index db6137a..124090c 100644 --- a/src/add_request_dialog.hh +++ b/src/add_request_dialog.hh @@ -27,7 +27,7 @@ namespace sgpem class Thread; } -#include "config.h" + #include #include diff --git a/src/backend/concrete_environment.hh b/src/backend/concrete_environment.hh index af79cdd..a270f77 100644 --- a/src/backend/concrete_environment.hh +++ b/src/backend/concrete_environment.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_ENVIRONMENT_HH #define CONCRETE_ENVIRONMENT_HH 1 -#include "config.h" + #include #include #include "dynamic_process.hh" diff --git a/src/backend/concrete_history.cc b/src/backend/concrete_history.cc index 81cfaba..0348663 100644 --- a/src/backend/concrete_history.cc +++ b/src/backend/concrete_history.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "dynamic_process.hh" #include "dynamic_thread.hh" diff --git a/src/backend/concrete_history.hh b/src/backend/concrete_history.hh index db699bc..7a7b680 100644 --- a/src/backend/concrete_history.hh +++ b/src/backend/concrete_history.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_HISTORY_HH #define CONCRETE_HISTORY_HH 1 -#include "config.h" + #include "concrete_environment.hh" #include "dynamic_process.hh" diff --git a/src/backend/concrete_process_statistics.hh b/src/backend/concrete_process_statistics.hh index 5ba5881..78694eb 100644 --- a/src/backend/concrete_process_statistics.hh +++ b/src/backend/concrete_process_statistics.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_PROCESS_STATISTICS_HH #define CONCRETE_PROCESS_STATISTICS_HH 1 -#include "config.h" + #include #include diff --git a/src/backend/concrete_simulation.hh b/src/backend/concrete_simulation.hh index 8458424..30dc461 100644 --- a/src/backend/concrete_simulation.hh +++ b/src/backend/concrete_simulation.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_SIMULATION_HH #define CONCRETE_SIMULATION_HH 1 -#include "config.h" + #include #include "concrete_history.hh" diff --git a/src/backend/concrete_simulation_statistics.hh b/src/backend/concrete_simulation_statistics.hh index be4c674..0f3dd50 100644 --- a/src/backend/concrete_simulation_statistics.hh +++ b/src/backend/concrete_simulation_statistics.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_SIMULATION_STATISTICS_HH #define CONCRETE_SIMULATION_STATISTICS_HH 1 -#include "config.h" + #include #include "concrete_process_statistics.hh" diff --git a/src/backend/concrete_statistics.hh b/src/backend/concrete_statistics.hh index 7eafe16..f8fa333 100644 --- a/src/backend/concrete_statistics.hh +++ b/src/backend/concrete_statistics.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_STATISTICS_HH #define CONCRETE_STATISTICS_HH 1 -#include "config.h" + #include #include "concrete_process_statistics.hh" diff --git a/src/backend/concrete_thread_statistics.hh b/src/backend/concrete_thread_statistics.hh index 57346d7..e95feeb 100644 --- a/src/backend/concrete_thread_statistics.hh +++ b/src/backend/concrete_thread_statistics.hh @@ -21,7 +21,7 @@ #ifndef CONCRETE_THREAD_STATISTICS_HH #define CONCRETE_THREAD_STATISTICS_HH 1 -#include "config.h" + #include diff --git a/src/backend/cpu_policies_gatekeeper.cc b/src/backend/cpu_policies_gatekeeper.cc index 72a4492..f8838ce 100644 --- a/src/backend/cpu_policies_gatekeeper.cc +++ b/src/backend/cpu_policies_gatekeeper.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include diff --git a/src/backend/dynamic_process.hh b/src/backend/dynamic_process.hh index b8cb614..45aa68c 100644 --- a/src/backend/dynamic_process.hh +++ b/src/backend/dynamic_process.hh @@ -21,7 +21,7 @@ #ifndef DYNAMIC_PROCESS_HH #define DYNAMIC_PROCESS_HH 1 -#include "config.h" + #include "gettext.h" #include diff --git a/src/backend/dynamic_request.hh b/src/backend/dynamic_request.hh index b0d2b89..9bb06a5 100644 --- a/src/backend/dynamic_request.hh +++ b/src/backend/dynamic_request.hh @@ -21,7 +21,7 @@ #ifndef DYNAMIC_REQUEST_HH #define DYNAMIC_REQUEST_HH 1 -#include "config.h" + #include #include "static_request.hh" diff --git a/src/backend/dynamic_resource.hh b/src/backend/dynamic_resource.hh index 93aff6e..352cc00 100644 --- a/src/backend/dynamic_resource.hh +++ b/src/backend/dynamic_resource.hh @@ -21,7 +21,7 @@ #ifndef DYNAMIC_RESOURCE_HH #define DYNAMIC_RESOURCE_HH 1 -#include "config.h" + #include "glibmm/ustring.h" #include diff --git a/src/backend/dynamic_schedulable.hh b/src/backend/dynamic_schedulable.hh index cd40640..714d865 100644 --- a/src/backend/dynamic_schedulable.hh +++ b/src/backend/dynamic_schedulable.hh @@ -21,7 +21,7 @@ #ifndef DYNAMIC_SCHEDULABLE_HH #define DYNAMIC_SCHEDULABLE_HH 1 -#include "config.h" + #include #include "static_schedulable.hh" diff --git a/src/backend/dynamic_sub_request.hh b/src/backend/dynamic_sub_request.hh index 8180141..3b7ca69 100644 --- a/src/backend/dynamic_sub_request.hh +++ b/src/backend/dynamic_sub_request.hh @@ -21,7 +21,7 @@ #ifndef DYNAMIC_SUB_REQUEST_HH #define DYNAMIC_SUB_REQUEST_HH 1 -#include "config.h" + #include #include diff --git a/src/backend/dynamic_thread.hh b/src/backend/dynamic_thread.hh index 4448bac..16ce4b2 100644 --- a/src/backend/dynamic_thread.hh +++ b/src/backend/dynamic_thread.hh @@ -21,7 +21,7 @@ #ifndef DYNAMIC_THREAD_HH #define DYNAMIC_THREAD_HH 1 -#include "config.h" + #include "gettext.h" #include "glibmm/ustring.h" #include diff --git a/src/backend/global_preferences.cc b/src/backend/global_preferences.cc index ba62c43..9f38ac1 100644 --- a/src/backend/global_preferences.cc +++ b/src/backend/global_preferences.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "gettext.h" #include diff --git a/src/backend/history.cc b/src/backend/history.cc index 574d000..54a116f 100644 --- a/src/backend/history.cc +++ b/src/backend/history.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include diff --git a/src/backend/invalid_plugin_exception.cc b/src/backend/invalid_plugin_exception.cc index 7b7a101..c177e89 100644 --- a/src/backend/invalid_plugin_exception.cc +++ b/src/backend/invalid_plugin_exception.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include diff --git a/src/backend/key_file.cc b/src/backend/key_file.cc index d758f82..8799169 100644 --- a/src/backend/key_file.cc +++ b/src/backend/key_file.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include #include diff --git a/src/backend/module.cc b/src/backend/module.cc index 049fa54..76d70f7 100644 --- a/src/backend/module.cc +++ b/src/backend/module.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include diff --git a/src/backend/plugin_manager.cc b/src/backend/plugin_manager.cc index f323042..0279abf 100644 --- a/src/backend/plugin_manager.cc +++ b/src/backend/plugin_manager.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include diff --git a/src/backend/ready_queue.cc b/src/backend/ready_queue.cc index 58c9630..b318dac 100644 --- a/src/backend/ready_queue.cc +++ b/src/backend/ready_queue.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "gettext.h" #include diff --git a/src/backend/resource_policies_gatekeeper.cc b/src/backend/resource_policies_gatekeeper.cc index 224fdd5..454d9eb 100644 --- a/src/backend/resource_policies_gatekeeper.cc +++ b/src/backend/resource_policies_gatekeeper.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include diff --git a/src/backend/serializer_error.cc b/src/backend/serializer_error.cc index 4b1b43c..4fb1801 100644 --- a/src/backend/serializer_error.cc +++ b/src/backend/serializer_error.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include diff --git a/src/backend/serializers_gatekeeper.cc b/src/backend/serializers_gatekeeper.cc index 2554407..fd35c13 100644 --- a/src/backend/serializers_gatekeeper.cc +++ b/src/backend/serializers_gatekeeper.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include diff --git a/src/backend/sgpemv2/cpu_policies_gatekeeper.hh b/src/backend/sgpemv2/cpu_policies_gatekeeper.hh index 569784b..2343e11 100644 --- a/src/backend/sgpemv2/cpu_policies_gatekeeper.hh +++ b/src/backend/sgpemv2/cpu_policies_gatekeeper.hh @@ -28,7 +28,7 @@ namespace sgpem class History; } -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/cpu_policy.hh b/src/backend/sgpemv2/cpu_policy.hh index 218f998..a1c2393 100644 --- a/src/backend/sgpemv2/cpu_policy.hh +++ b/src/backend/sgpemv2/cpu_policy.hh @@ -21,7 +21,7 @@ #ifndef CPU_POLICY_HH #define CPU_POLICY_HH 1 -#include "config.h" +#include #include "gettext.h" #include "glibmm/ustring.h" diff --git a/src/backend/sgpemv2/cpu_policy_exception.hh b/src/backend/sgpemv2/cpu_policy_exception.hh index b34f061..1623c0a 100644 --- a/src/backend/sgpemv2/cpu_policy_exception.hh +++ b/src/backend/sgpemv2/cpu_policy_exception.hh @@ -25,7 +25,7 @@ #ifndef CPU_POLICY_EXCEPTION #define CPU_POLICY_EXCEPTION 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/cpu_policy_manager.hh b/src/backend/sgpemv2/cpu_policy_manager.hh index aaa8e15..f4f8f46 100644 --- a/src/backend/sgpemv2/cpu_policy_manager.hh +++ b/src/backend/sgpemv2/cpu_policy_manager.hh @@ -26,7 +26,7 @@ namespace sgpem class CPUPolicyManager; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/default_resource_policy_manager.hh b/src/backend/sgpemv2/default_resource_policy_manager.hh index f61053d..5045f1f 100644 --- a/src/backend/sgpemv2/default_resource_policy_manager.hh +++ b/src/backend/sgpemv2/default_resource_policy_manager.hh @@ -26,7 +26,7 @@ namespace sgpem class ResourcePolicy; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/environment.hh b/src/backend/sgpemv2/environment.hh index 48eaad5..df94f0e 100644 --- a/src/backend/sgpemv2/environment.hh +++ b/src/backend/sgpemv2/environment.hh @@ -21,7 +21,7 @@ #ifndef ENVIRONMENT_HH #define ENVIRONMENT_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/global_preferences.hh b/src/backend/sgpemv2/global_preferences.hh index ebfdb70..f023465 100644 --- a/src/backend/sgpemv2/global_preferences.hh +++ b/src/backend/sgpemv2/global_preferences.hh @@ -21,7 +21,7 @@ #ifndef GLOBAL_PREFERENCES_HH #define GLOBAL_PREFERENCES_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/history.hh b/src/backend/sgpemv2/history.hh index 6148d17..178c360 100644 --- a/src/backend/sgpemv2/history.hh +++ b/src/backend/sgpemv2/history.hh @@ -21,7 +21,7 @@ #ifndef HISTORY_HH #define HISTORY_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/history_observer.hh b/src/backend/sgpemv2/history_observer.hh index 5d21354..ee87ca1 100644 --- a/src/backend/sgpemv2/history_observer.hh +++ b/src/backend/sgpemv2/history_observer.hh @@ -21,7 +21,7 @@ #ifndef HISTORY_OBSERVER_HH #define HISTORY_OBSERVER_HH 1 -#include "config.h" +#include namespace sgpem { diff --git a/src/backend/sgpemv2/invalid_plugin_exception.hh b/src/backend/sgpemv2/invalid_plugin_exception.hh index bc513be..edb44e6 100644 --- a/src/backend/sgpemv2/invalid_plugin_exception.hh +++ b/src/backend/sgpemv2/invalid_plugin_exception.hh @@ -21,7 +21,7 @@ #ifndef INVALID_PLUGIN_EXCEPTION_HH #define INVALID_PLUGIN_EXCEPTION_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/key_file.hh b/src/backend/sgpemv2/key_file.hh index 362bed0..3087fc4 100644 --- a/src/backend/sgpemv2/key_file.hh +++ b/src/backend/sgpemv2/key_file.hh @@ -26,7 +26,7 @@ namespace sgpem class KeyFile; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/malformed_policy_exception.hh b/src/backend/sgpemv2/malformed_policy_exception.hh index f0b6c5f..a255175 100644 --- a/src/backend/sgpemv2/malformed_policy_exception.hh +++ b/src/backend/sgpemv2/malformed_policy_exception.hh @@ -25,7 +25,7 @@ #ifndef MALFORMED_POLICY_EXCEPTION #define MALFORMED_POLICY_EXCEPTION 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/module.hh b/src/backend/sgpemv2/module.hh index 51de7b1..926d6a3 100644 --- a/src/backend/sgpemv2/module.hh +++ b/src/backend/sgpemv2/module.hh @@ -21,7 +21,7 @@ #ifndef MODULE_HH #define MODULE_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/null_policy_exception.hh b/src/backend/sgpemv2/null_policy_exception.hh index b0164f1..848aee2 100644 --- a/src/backend/sgpemv2/null_policy_exception.hh +++ b/src/backend/sgpemv2/null_policy_exception.hh @@ -25,7 +25,7 @@ #ifndef NULL_POLICY_EXCEPTION #define NULL_POLICY_EXCEPTION 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/plugin.hh b/src/backend/sgpemv2/plugin.hh index 5312084..6a85067 100644 --- a/src/backend/sgpemv2/plugin.hh +++ b/src/backend/sgpemv2/plugin.hh @@ -21,7 +21,7 @@ #ifndef SGPEMV2__PLUGIN_HH #define SGPEMV2__PLUGIN_HH 1 -#include "config.h" +#include #ifdef __cplusplus extern "C" diff --git a/src/backend/sgpemv2/plugin_manager.hh b/src/backend/sgpemv2/plugin_manager.hh index 7a0b7ef..bf6ff14 100644 --- a/src/backend/sgpemv2/plugin_manager.hh +++ b/src/backend/sgpemv2/plugin_manager.hh @@ -26,7 +26,7 @@ namespace sgpem class Module; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/policy_parameters.hh b/src/backend/sgpemv2/policy_parameters.hh index c5259d4..8fe2411 100644 --- a/src/backend/sgpemv2/policy_parameters.hh +++ b/src/backend/sgpemv2/policy_parameters.hh @@ -21,7 +21,7 @@ #ifndef POLICY_PARAMETERS_HH #define POLICY_PARAMETERS_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/process.hh b/src/backend/sgpemv2/process.hh index f7c67dd..851722c 100644 --- a/src/backend/sgpemv2/process.hh +++ b/src/backend/sgpemv2/process.hh @@ -21,7 +21,7 @@ #ifndef PROCESS_HH #define PROCESS_HH 1 -#include "config.h" +#include #include "glibmm/ustring.h" #include diff --git a/src/backend/sgpemv2/process_statistics.hh b/src/backend/sgpemv2/process_statistics.hh index ca49e7f..faef4d5 100644 --- a/src/backend/sgpemv2/process_statistics.hh +++ b/src/backend/sgpemv2/process_statistics.hh @@ -21,7 +21,7 @@ #ifndef PROCESS_STATISTICS_HH #define PROCESS_STATISTICS_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/ready_queue.hh b/src/backend/sgpemv2/ready_queue.hh index be95e17..89e51c4 100644 --- a/src/backend/sgpemv2/ready_queue.hh +++ b/src/backend/sgpemv2/ready_queue.hh @@ -21,7 +21,7 @@ #ifndef READY_QUEUE_HH #define READY_QUEUE_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/request.hh b/src/backend/sgpemv2/request.hh index 2720ec1..fe2685b 100644 --- a/src/backend/sgpemv2/request.hh +++ b/src/backend/sgpemv2/request.hh @@ -29,7 +29,7 @@ namespace sgpem class Thread; } -#include "config.h" +#include #include namespace sgpem diff --git a/src/backend/sgpemv2/resource.hh b/src/backend/sgpemv2/resource.hh index 88cb704..f803a63 100644 --- a/src/backend/sgpemv2/resource.hh +++ b/src/backend/sgpemv2/resource.hh @@ -21,7 +21,7 @@ #ifndef RESOURCE_HH #define RESOURCE_HH 1 -#include "config.h" +#include #include "glibmm/ustring.h" namespace sgpem diff --git a/src/backend/sgpemv2/resource_policies_gatekeeper.hh b/src/backend/sgpemv2/resource_policies_gatekeeper.hh index 07637f5..1602748 100644 --- a/src/backend/sgpemv2/resource_policies_gatekeeper.hh +++ b/src/backend/sgpemv2/resource_policies_gatekeeper.hh @@ -28,7 +28,7 @@ namespace sgpem class History; } -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/resource_policy.hh b/src/backend/sgpemv2/resource_policy.hh index 985d2c4..c20c0fb 100644 --- a/src/backend/sgpemv2/resource_policy.hh +++ b/src/backend/sgpemv2/resource_policy.hh @@ -21,7 +21,7 @@ #ifndef RESOURCE_POLICY_HH #define RESOURCE_POLICY_HH 1 -#include "config.h" +#include #include "gettext.h" #include "glibmm/ustring.h" diff --git a/src/backend/sgpemv2/resource_policy_fifo.hh b/src/backend/sgpemv2/resource_policy_fifo.hh index 1661c0f..a3eca20 100644 --- a/src/backend/sgpemv2/resource_policy_fifo.hh +++ b/src/backend/sgpemv2/resource_policy_fifo.hh @@ -21,7 +21,7 @@ #ifndef RESOURCE_POLICY_FIFO_HH #define RESOURCE_POLICY_FIFO_HH 1 -#include "config.h" +#include #include "gettext.h" #include "glibmm/ustring.h" diff --git a/src/backend/sgpemv2/resource_policy_lifo.hh b/src/backend/sgpemv2/resource_policy_lifo.hh index e2de132..1bc4715 100644 --- a/src/backend/sgpemv2/resource_policy_lifo.hh +++ b/src/backend/sgpemv2/resource_policy_lifo.hh @@ -21,7 +21,7 @@ #ifndef RESOURCE_POLICY_LIFO_HH #define RESOURCE_POLICY_LIFO_HH 1 -#include "config.h" +#include #include "gettext.h" #include "glibmm/ustring.h" diff --git a/src/backend/sgpemv2/resource_policy_manager.hh b/src/backend/sgpemv2/resource_policy_manager.hh index c8b7a62..a729fa5 100644 --- a/src/backend/sgpemv2/resource_policy_manager.hh +++ b/src/backend/sgpemv2/resource_policy_manager.hh @@ -26,7 +26,7 @@ namespace sgpem class ResourcePolicy; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/resource_policy_priority.hh b/src/backend/sgpemv2/resource_policy_priority.hh index 7659bab..a216656 100644 --- a/src/backend/sgpemv2/resource_policy_priority.hh +++ b/src/backend/sgpemv2/resource_policy_priority.hh @@ -21,7 +21,7 @@ #ifndef RESOURCE_POLICY_PRIORITY_HH #define RESOURCE_POLICY_PRIORITY_HH 1 -#include "config.h" +#include #include "gettext.h" #include "glibmm/ustring.h" diff --git a/src/backend/sgpemv2/resource_policy_priority_inheritance.hh b/src/backend/sgpemv2/resource_policy_priority_inheritance.hh index 28c3c3b..a2e7922 100644 --- a/src/backend/sgpemv2/resource_policy_priority_inheritance.hh +++ b/src/backend/sgpemv2/resource_policy_priority_inheritance.hh @@ -26,7 +26,7 @@ namespace sgpem class ResourcePolicyPriorityInheritance; } -#include "config.h" +#include #include "gettext.h" #include diff --git a/src/backend/sgpemv2/schedulable.hh b/src/backend/sgpemv2/schedulable.hh index 5ac03de..b91dfe4 100644 --- a/src/backend/sgpemv2/schedulable.hh +++ b/src/backend/sgpemv2/schedulable.hh @@ -21,7 +21,7 @@ #ifndef SCHEDULABLE_HH #define SCHEDULABLE_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/schedulable_statistics.hh b/src/backend/sgpemv2/schedulable_statistics.hh index 59dc4df..5e72f65 100644 --- a/src/backend/sgpemv2/schedulable_statistics.hh +++ b/src/backend/sgpemv2/schedulable_statistics.hh @@ -21,7 +21,7 @@ #ifndef SCHEDULABLE_STATISTICS_HH #define SCHEDULABLE_STATISTICS_HH 1 -#include "config.h" +#include #include "schedulable.hh" #include diff --git a/src/backend/sgpemv2/scheduler.hh b/src/backend/sgpemv2/scheduler.hh index d880ad6..b33da05 100644 --- a/src/backend/sgpemv2/scheduler.hh +++ b/src/backend/sgpemv2/scheduler.hh @@ -26,7 +26,7 @@ namespace sgpem class CPUPolicy; } -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/serialize_visitor.hh b/src/backend/sgpemv2/serialize_visitor.hh index 4e1776c..cde5f62 100644 --- a/src/backend/sgpemv2/serialize_visitor.hh +++ b/src/backend/sgpemv2/serialize_visitor.hh @@ -32,7 +32,7 @@ namespace sgpem class SubRequest; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/serializer.hh b/src/backend/sgpemv2/serializer.hh index 4bf0bc2..a916bd8 100644 --- a/src/backend/sgpemv2/serializer.hh +++ b/src/backend/sgpemv2/serializer.hh @@ -21,7 +21,7 @@ #ifndef SERIALIZER_HH #define SERIALIZER_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/serializer_error.hh b/src/backend/sgpemv2/serializer_error.hh index b53bef6..c906ab3 100644 --- a/src/backend/sgpemv2/serializer_error.hh +++ b/src/backend/sgpemv2/serializer_error.hh @@ -21,7 +21,7 @@ #ifndef SERIALIZER_ERROR_HH #define SERIALIZER_ERROR_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/serializers_gatekeeper.hh b/src/backend/sgpemv2/serializers_gatekeeper.hh index 1673f58..9eee5ab 100644 --- a/src/backend/sgpemv2/serializers_gatekeeper.hh +++ b/src/backend/sgpemv2/serializers_gatekeeper.hh @@ -26,7 +26,7 @@ namespace sgpem class Serializer; } -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/sgpemv2-visibility.hh b/src/backend/sgpemv2/sgpemv2-visibility.hh new file mode 100644 index 0000000..d8e4793 --- /dev/null +++ b/src/backend/sgpemv2/sgpemv2-visibility.hh @@ -0,0 +1,32 @@ + +// Visibility macros for GNU GCC + +#if defined __GNUC__ && (__GNUC__) >= 4 + + /* Attribute for objects to be exported from DSOs */ + #define SG_DLLEXPORT __attribute__ ((visibility("default"))) + + /* Attribute for objects to be imported from DSOs */ + #define SG_DLLIMPORT /* intentionally left with no value */ + + /* Attribute for objects local to current DSO */ + #define SG_DLLLOCAL __attribute__ ((visibility("hidden"))) + + /* Attribute for DSO public objects */ + #define SG_DLLPUBLIC __attribute__ ((visibility("default"))) + +#else + + /* Attribute for objects to be exported from DSOs */ + #define SG_DLLEXPORT /* Unsupported */ + + /* Attribute for objects to be imported from DSOs */ + #define SG_DLLIMPORT /* Unsupported */ + + /* Attribute for objects local to current DSO */ + #define SG_DLLLOCAL /* Unsupported */ + + /* Attribute for DSO public objects */ + #define SG_DLLPUBLIC /* Unsupported */ + +#endif diff --git a/src/backend/sgpemv2/simulation.hh b/src/backend/sgpemv2/simulation.hh index b895c2c..5c55bd1 100644 --- a/src/backend/sgpemv2/simulation.hh +++ b/src/backend/sgpemv2/simulation.hh @@ -29,7 +29,7 @@ namespace sgpem class SimulationObserver; } -#include "config.h" +#include #include #include #include diff --git a/src/backend/sgpemv2/simulation_observer.hh b/src/backend/sgpemv2/simulation_observer.hh index 48f3aeb..3486047 100644 --- a/src/backend/sgpemv2/simulation_observer.hh +++ b/src/backend/sgpemv2/simulation_observer.hh @@ -21,7 +21,7 @@ #ifndef SIMULATION_OBSERVER_HH #define SIMULATION_OBSERVER_HH 1 -#include "config.h" +#include namespace sgpem { diff --git a/src/backend/sgpemv2/simulation_statistics.hh b/src/backend/sgpemv2/simulation_statistics.hh index d2fabb4..d1b9b59 100644 --- a/src/backend/sgpemv2/simulation_statistics.hh +++ b/src/backend/sgpemv2/simulation_statistics.hh @@ -21,7 +21,7 @@ #ifndef SIMULATION_STATISTICS_HH #define SIMULATION_STATISTICS_HH 1 -#include "config.h" +#include namespace sgpem diff --git a/src/backend/sgpemv2/statistics.hh b/src/backend/sgpemv2/statistics.hh index dec07d2..918edb0 100755 --- a/src/backend/sgpemv2/statistics.hh +++ b/src/backend/sgpemv2/statistics.hh @@ -21,7 +21,7 @@ #ifndef STATISTICS_HH #define STATISTICS_HH 1 -#include "config.h" +#include #include #include #include diff --git a/src/backend/sgpemv2/string_utils.hh b/src/backend/sgpemv2/string_utils.hh index d181127..89988f5 100644 --- a/src/backend/sgpemv2/string_utils.hh +++ b/src/backend/sgpemv2/string_utils.hh @@ -21,7 +21,7 @@ #ifndef STRING_UTILS_HH #define STRING_UTILS_HH 1 -#include "config.h" +#include #include #include #include diff --git a/src/backend/sgpemv2/sub_request.hh b/src/backend/sgpemv2/sub_request.hh index 8360a79..7c2141b 100644 --- a/src/backend/sgpemv2/sub_request.hh +++ b/src/backend/sgpemv2/sub_request.hh @@ -21,7 +21,7 @@ #ifndef SUB_REQUEST_HH #define SUB_REQUEST_HH 1 -#include "config.h" +#include #include diff --git a/src/backend/sgpemv2/templates/singleton.hh b/src/backend/sgpemv2/templates/singleton.hh index 3b5a286..43b6759 100644 --- a/src/backend/sgpemv2/templates/singleton.hh +++ b/src/backend/sgpemv2/templates/singleton.hh @@ -20,7 +20,7 @@ #define SINGLETON_HH 1 #include -#include "config.h" +#include namespace sgpem { diff --git a/src/backend/sgpemv2/thread.hh b/src/backend/sgpemv2/thread.hh index ec383be..ef7475d 100644 --- a/src/backend/sgpemv2/thread.hh +++ b/src/backend/sgpemv2/thread.hh @@ -21,7 +21,7 @@ #ifndef THREAD_HH #define THREAD_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/thread_statistics.hh b/src/backend/sgpemv2/thread_statistics.hh index 5063121..ec0d98f 100644 --- a/src/backend/sgpemv2/thread_statistics.hh +++ b/src/backend/sgpemv2/thread_statistics.hh @@ -21,7 +21,7 @@ #ifndef THREAD_STATISTICS_HH #define THREAD_STATISTICS_HH 1 -#include "config.h" +#include #include #include diff --git a/src/backend/sgpemv2/user_interrupt_exception.hh b/src/backend/sgpemv2/user_interrupt_exception.hh index a0f2007..dee77b5 100644 --- a/src/backend/sgpemv2/user_interrupt_exception.hh +++ b/src/backend/sgpemv2/user_interrupt_exception.hh @@ -25,7 +25,7 @@ #ifndef USER_INTERRUPT_EXCEPTION #define USER_INTERRUPT_EXCEPTION 1 -#include "config.h" +#include #include #include diff --git a/src/backend/simulation.cc b/src/backend/simulation.cc index 57b83b4..91aece2 100644 --- a/src/backend/simulation.cc +++ b/src/backend/simulation.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include #include diff --git a/src/backend/static_process.hh b/src/backend/static_process.hh index cb9df8f..4ccc9fa 100644 --- a/src/backend/static_process.hh +++ b/src/backend/static_process.hh @@ -21,7 +21,7 @@ #ifndef STATIC_PROCESS_HH #define STATIC_PROCESS_HH 1 -#include "config.h" + #include "static_schedulable.hh" #include "static_thread.hh" @@ -38,7 +38,7 @@ namespace sgpem It IS a Schedulable object. */ - class SG_DLLLOCAL StaticProcess : public StaticSchedulable + class StaticProcess : public StaticSchedulable { public: /** \brief Creates a new object with the given parameters. */ diff --git a/src/backend/static_request.hh b/src/backend/static_request.hh index 41966cc..c89e94a 100644 --- a/src/backend/static_request.hh +++ b/src/backend/static_request.hh @@ -23,7 +23,7 @@ #include "static_thread.hh" -#include "config.h" + #include "glibmm/ustring.h" namespace sgpem @@ -31,7 +31,7 @@ namespace sgpem class StaticRequest; class SerializeVisitor; - class SG_DLLLOCAL StaticRequest + class StaticRequest { public: StaticRequest(StaticThread* thread, unsigned int instant); diff --git a/src/backend/static_resource.hh b/src/backend/static_resource.hh index 407a40e..4cbbed3 100644 --- a/src/backend/static_resource.hh +++ b/src/backend/static_resource.hh @@ -21,7 +21,7 @@ #ifndef STATIC_RESOURCE_HH #define STATIC_RESOURCE_HH 1 -#include "config.h" + #include "glibmm/ustring.h" namespace sgpem @@ -29,7 +29,7 @@ namespace sgpem class StaticResource; class SerializeVisitor; - class SG_DLLLOCAL StaticResource + class StaticResource { public: StaticResource(const Glib::ustring& name, unsigned int places = 1); diff --git a/src/backend/static_schedulable.hh b/src/backend/static_schedulable.hh index 7eddd0f..1cb11ad 100644 --- a/src/backend/static_schedulable.hh +++ b/src/backend/static_schedulable.hh @@ -21,7 +21,7 @@ #ifndef STATIC_SCHEDULABLE_HH #define STATIC_SCHEDULABLE_HH 1 -#include "config.h" + #include "glibmm/ustring.h" namespace sgpem @@ -38,7 +38,7 @@ namespace sgpem * * \see DynamicSchedulable */ - class SG_DLLLOCAL StaticSchedulable + class StaticSchedulable { public: /** \brief Create a new object with the given parameters */ diff --git a/src/backend/static_sub_request.hh b/src/backend/static_sub_request.hh index c91a3b4..f35ded0 100644 --- a/src/backend/static_sub_request.hh +++ b/src/backend/static_sub_request.hh @@ -21,7 +21,7 @@ #ifndef STATIC_SUB_REQUEST_HH #define STATIC_SUB_REQUEST_HH 1 -#include "config.h" + #include @@ -31,7 +31,7 @@ namespace sgpem class StaticRequest; class StaticResource; - class SG_DLLLOCAL StaticSubRequest + class StaticSubRequest { public: typedef SubRequest::resource_key_t resource_key_t; diff --git a/src/backend/static_thread.hh b/src/backend/static_thread.hh index 6385afc..428bdd3 100644 --- a/src/backend/static_thread.hh +++ b/src/backend/static_thread.hh @@ -24,7 +24,7 @@ #include "static_process.hh" #include "static_schedulable.hh" -#include "config.h" + #include "gettext.h" #include @@ -37,7 +37,7 @@ namespace sgpem class StaticThread; class StaticRequest; - class SG_DLLLOCAL StaticThread : public StaticSchedulable + class StaticThread : public StaticSchedulable { public: StaticThread(const Glib::ustring& name, diff --git a/src/backend/statistics.cc b/src/backend/statistics.cc old mode 100755 new mode 100644 diff --git a/src/cairo_elements.hh b/src/cairo_elements.hh index 7146d5f..21c3916 100644 --- a/src/cairo_elements.hh +++ b/src/cairo_elements.hh @@ -21,7 +21,7 @@ #ifndef CAIRO_ELEMENTS_HH #define CAIRO_ELEMENTS_HH 1 -#include "config.h" + #include #include diff --git a/src/cairo_widget.hh b/src/cairo_widget.hh index 2299835..ffebf01 100644 --- a/src/cairo_widget.hh +++ b/src/cairo_widget.hh @@ -21,7 +21,7 @@ #ifndef CAIRO_WIDGET_HH #define CAIRO_WIDGET_HH 1 -#include "config.h" + #include #include diff --git a/src/graphical_preferences_editor.cc b/src/graphical_preferences_editor.cc index 27e77d3..4cb2848 100644 --- a/src/graphical_preferences_editor.cc +++ b/src/graphical_preferences_editor.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "gettext.h" #include "graphical_preferences_editor.hh" diff --git a/src/graphical_preferences_editor.hh b/src/graphical_preferences_editor.hh index c6664ee..9eacaa0 100644 --- a/src/graphical_preferences_editor.hh +++ b/src/graphical_preferences_editor.hh @@ -22,7 +22,7 @@ #define GRAPHICAL_PREFERENCES_EDITOR_HH 1 -#include "config.h" + #include diff --git a/src/gui_builder.cc b/src/gui_builder.cc index d2b970c..cf3a1cd 100644 --- a/src/gui_builder.cc +++ b/src/gui_builder.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "gettext.h" #include "gui_builder.hh" diff --git a/src/gui_builder.hh b/src/gui_builder.hh index 639e4b6..baa288d 100644 --- a/src/gui_builder.hh +++ b/src/gui_builder.hh @@ -21,7 +21,7 @@ #ifndef GUI_BUILDER_HH #define GUI_BUILDER_HH 1 -#include "config.h" + #include "holt_container_window.hh" #include "statistics_container_window.hh" #include "simulation_widget.hh" diff --git a/src/holt_container_window.hh b/src/holt_container_window.hh index 5b1935f..31bdbe9 100644 --- a/src/holt_container_window.hh +++ b/src/holt_container_window.hh @@ -21,7 +21,7 @@ #ifndef HOLT_CONTAINER_WINDOW_HH #define HOLT_CONTAINER_WINDOW_HH 1 -#include "config.h" + #include "gettext.h" #include diff --git a/src/holt_widget.hh b/src/holt_widget.hh index 863dba8..3b616bf 100644 --- a/src/holt_widget.hh +++ b/src/holt_widget.hh @@ -21,7 +21,7 @@ #ifndef HOLT_WIDGET_HH #define HOLT_WIDGET_HH 1 -#include "config.h" + #include "cairo_widget.hh" #include diff --git a/src/jump_to_dialog.hh b/src/jump_to_dialog.hh index fd07e85..33d283c 100644 --- a/src/jump_to_dialog.hh +++ b/src/jump_to_dialog.hh @@ -21,7 +21,7 @@ #ifndef JUMP_TO_DIALOG_HH #define JUMP_TO_DIALOG_HH 1 -#include "config.h" + #include diff --git a/src/main.cc b/src/main.cc index 404b4ab..cc8ab72 100644 --- a/src/main.cc +++ b/src/main.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "gettext.h" #include "main.hh" diff --git a/src/parse_opts.cc b/src/parse_opts.cc index c28b678..b8d1d3f 100644 --- a/src/parse_opts.cc +++ b/src/parse_opts.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "gettext.h" #include diff --git a/src/ready_queue_widget.hh b/src/ready_queue_widget.hh index c70701d..cf91569 100644 --- a/src/ready_queue_widget.hh +++ b/src/ready_queue_widget.hh @@ -21,7 +21,7 @@ #ifndef READY_QUEUE_WIDGET_HH #define READY_QUEUE_WIDGET_HH 1 -#include "config.h" + #include diff --git a/src/resources_widget.hh b/src/resources_widget.hh index a6b7485..8bb7cda 100644 --- a/src/resources_widget.hh +++ b/src/resources_widget.hh @@ -26,7 +26,7 @@ namespace sgpem class Resource; } -#include "config.h" + #include #include diff --git a/src/schedulable_state_widget.hh b/src/schedulable_state_widget.hh index 4c77678..868f031 100644 --- a/src/schedulable_state_widget.hh +++ b/src/schedulable_state_widget.hh @@ -21,7 +21,7 @@ #ifndef SCHEDULABLE_STATE_WIDGET_HH #define SCHEDULABLE_STATE_WIDGET_HH 1 -#include "config.h" + #include #include "cairo_elements.hh" diff --git a/src/schedulables_statistics_widget.hh b/src/schedulables_statistics_widget.hh index ea777f8..a7bc085 100644 --- a/src/schedulables_statistics_widget.hh +++ b/src/schedulables_statistics_widget.hh @@ -21,7 +21,7 @@ #ifndef SCHEDULABLE_STATISTICS_WIDGET_HH #define SCHEDULABLE_STATISTICS_WIDGET_HH 1 -#include "config.h" + #include "cairo_widget.hh" #include diff --git a/src/schedulables_tree_widget.hh b/src/schedulables_tree_widget.hh index 4aba12c..85df8ec 100644 --- a/src/schedulables_tree_widget.hh +++ b/src/schedulables_tree_widget.hh @@ -30,7 +30,7 @@ namespace sgpem class Request; } -#include "config.h" + #include #include diff --git a/src/simulation_controller.hh b/src/simulation_controller.hh index 5847c22..b5688d1 100644 --- a/src/simulation_controller.hh +++ b/src/simulation_controller.hh @@ -21,7 +21,7 @@ #ifndef SIMULATION_CONTROLLER_HH #define SIMULATION_CONTROLLER_HH 1 -#include "config.h" + #include diff --git a/src/simulation_statistics_widget.hh b/src/simulation_statistics_widget.hh index de36245..9092d16 100644 --- a/src/simulation_statistics_widget.hh +++ b/src/simulation_statistics_widget.hh @@ -21,7 +21,7 @@ #ifndef SIMULATION_STATISTICS_WIDGET_HH #define SIMULATION_STATISTICS_WIDGET_HH 1 -#include "config.h" + #include diff --git a/src/simulation_widget.hh b/src/simulation_widget.hh index ab73c8b..4151b80 100644 --- a/src/simulation_widget.hh +++ b/src/simulation_widget.hh @@ -21,7 +21,7 @@ #ifndef SIMULATION_WIDGET_HH #define SIMULATION_WIDGET_HH 1 -#include "config.h" + #include "cairo_widget.hh" #include diff --git a/src/statistics_container_window.hh b/src/statistics_container_window.hh index 12331da..78d98e9 100644 --- a/src/statistics_container_window.hh +++ b/src/statistics_container_window.hh @@ -24,7 +24,7 @@ #include "schedulables_statistics_widget.hh" #include "simulation_statistics_widget.hh" -#include "config.h" + #include "gettext.h" #include diff --git a/src/testsuite/test-cairo_widget.cc b/src/testsuite/test-cairo_widget.cc index 04b5cc0..1e3ad61 100644 --- a/src/testsuite/test-cairo_widget.cc +++ b/src/testsuite/test-cairo_widget.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "config.h" + #include "cairo_widget.hh" #include "cairo_elements.hh" diff --git a/src/testsuite/test-global_preferences_serialization.cc b/src/testsuite/test-global_preferences_serialization.cc index 17b35cc..f3b9af6 100644 --- a/src/testsuite/test-global_preferences_serialization.cc +++ b/src/testsuite/test-global_preferences_serialization.cc @@ -21,7 +21,7 @@ /* This executable tests for workingness of the save preferences method, * and nothing else. */ -#include "config.h" + #include "glibmm/ustring.h" #include #include diff --git a/src/testsuite/test-history.cc b/src/testsuite/test-history.cc index caf3060..3561764 100644 --- a/src/testsuite/test-history.cc +++ b/src/testsuite/test-history.cc @@ -21,7 +21,7 @@ /* This executable tests for workingness of the whole History services, * and nothing else. */ -#include "config.h" + #include "gettext.h" #include diff --git a/src/testsuite/test-holt_widget.cc b/src/testsuite/test-holt_widget.cc index 3718c6f..c928ae4 100644 --- a/src/testsuite/test-holt_widget.cc +++ b/src/testsuite/test-holt_widget.cc @@ -21,7 +21,7 @@ /* This executable tests for workingness of the SimulationWidget class, * and nothing else. */ -#include "config.h" + #include "gettext.h" #include diff --git a/src/testsuite/test-key_file.cc b/src/testsuite/test-key_file.cc index 3a1e75d..4df2391 100644 --- a/src/testsuite/test-key_file.cc +++ b/src/testsuite/test-key_file.cc @@ -21,7 +21,7 @@ /* This executable tests for workingness of the save preferences method, * and nothing else. */ -#include "config.h" + #include "glibmm/ustring.h" #include #include diff --git a/src/testsuite/test-parse_command.cc b/src/testsuite/test-parse_command.cc index e9c5064..6321ea9 100644 --- a/src/testsuite/test-parse_command.cc +++ b/src/testsuite/test-parse_command.cc @@ -27,7 +27,7 @@ #include #include -#include "config.h" + #include "gettext.h" #include "glibmm/ustring.h" diff --git a/src/testsuite/test-simulation_widget.cc b/src/testsuite/test-simulation_widget.cc index 6667590..31cfc39 100644 --- a/src/testsuite/test-simulation_widget.cc +++ b/src/testsuite/test-simulation_widget.cc @@ -21,7 +21,7 @@ /* This executable tests for workingness of the SimulationWidget class, * and nothing else. */ -#include "config.h" + #include "gettext.h" #include diff --git a/src/testsuite/test-stepforward.cc b/src/testsuite/test-stepforward.cc index 0a66c2c..69cb87c 100644 --- a/src/testsuite/test-stepforward.cc +++ b/src/testsuite/test-stepforward.cc @@ -26,7 +26,7 @@ #include // ?? #include #include -#include "config.h" + #include "gettext.h" #include "glibmm/ustring.h" #include diff --git a/src/text_simulation.hh b/src/text_simulation.hh index 36192a3..1231419 100644 --- a/src/text_simulation.hh +++ b/src/text_simulation.hh @@ -21,7 +21,7 @@ #ifndef TEXT_SIMULATION_HH #define TEXT_SIMULATION_HH 1 -#include "config.h" + #include "gettext.h" #include