This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch WIP in repository cnrun.
commit 1c8b45127256f878561a111da0ca2964bc6d9ec1 Author: Andrei Zavada <johnhom...@gmail.com> Date: Sun Mar 23 18:24:00 2014 +0200 include "config.h" conditionally --- upstream/src/libcn/base-neuron.hh | 4 +++- upstream/src/libcn/base-synapse.hh | 4 +++- upstream/src/libcn/base-unit.cc | 4 +++- upstream/src/libcn/base-unit.hh | 4 +++- upstream/src/libcn/hosted-attr.hh | 5 ++++- upstream/src/libcn/hosted-neurons.cc | 5 ++++- upstream/src/libcn/hosted-neurons.hh | 6 ++++-- upstream/src/libcn/hosted-synapses.cc | 4 +++- upstream/src/libcn/hosted-synapses.hh | 5 ++++- upstream/src/libcn/integrate-base.hh | 5 ++++- upstream/src/libcn/integrate-rk65.hh | 4 +++- upstream/src/libcn/model-cycle.cc | 4 +++- upstream/src/libcn/model-nmlio.cc | 4 +++- upstream/src/libcn/model-struct.cc | 5 ++++- upstream/src/libcn/model.hh | 4 +++- upstream/src/libcn/mx-attr.hh | 4 +++- upstream/src/libcn/param-unit-literals.hh | 5 ++++- upstream/src/libcn/sources.cc | 4 +++- upstream/src/libcn/sources.hh | 5 ++++- upstream/src/libcn/standalone-attr.hh | 5 ++++- upstream/src/libcn/standalone-neurons.cc | 4 +++- upstream/src/libcn/standalone-neurons.hh | 4 +++- upstream/src/libcn/standalone-synapses.cc | 5 ++++- upstream/src/libcn/standalone-synapses.hh | 4 +++- upstream/src/libcn/types.cc | 5 ++++- upstream/src/libcn/types.hh | 5 ++++- upstream/src/libstilton/exprparser.cc | 6 ++++-- upstream/src/libstilton/exprparser.hh | 4 ++++ upstream/src/libstilton/log-facility.cc | 6 ++++-- upstream/src/libstilton/log-facility.hh | 3 +++ upstream/src/libstilton/pointaligned-s.cc | 6 ++++-- upstream/src/libstilton/pointaligned-s.hh | 4 ++++ upstream/src/tools/hh-latency-estimator.cc | 4 +++- upstream/src/tools/spike2sdf.cc | 4 ++++ upstream/src/tools/varfold.cc | 4 ++++ 35 files changed, 124 insertions(+), 34 deletions(-) diff --git a/upstream/src/libcn/base-neuron.hh b/upstream/src/libcn/base-neuron.hh index 7574d41..d35cdfe 100644 --- a/upstream/src/libcn/base-neuron.hh +++ b/upstream/src/libcn/base-neuron.hh @@ -21,7 +21,9 @@ #include "base-unit.hh" #include "base-synapse.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif diff --git a/upstream/src/libcn/base-synapse.hh b/upstream/src/libcn/base-synapse.hh index 6efe2ae..ae5ce71 100644 --- a/upstream/src/libcn/base-synapse.hh +++ b/upstream/src/libcn/base-synapse.hh @@ -21,7 +21,9 @@ #include "base-unit.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/base-unit.cc b/upstream/src/libcn/base-unit.cc index 8f6e227..82c9394 100644 --- a/upstream/src/libcn/base-unit.cc +++ b/upstream/src/libcn/base-unit.cc @@ -20,7 +20,9 @@ #include "base-unit.hh" #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/base-unit.hh b/upstream/src/libcn/base-unit.hh index 19c4d12..4a44aea 100644 --- a/upstream/src/libcn/base-unit.hh +++ b/upstream/src/libcn/base-unit.hh @@ -20,7 +20,9 @@ #include "types.hh" #include "sources.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/hosted-attr.hh b/upstream/src/libcn/hosted-attr.hh index 8e7d9a0..fc8fc7a 100644 --- a/upstream/src/libcn/hosted-attr.hh +++ b/upstream/src/libcn/hosted-attr.hh @@ -14,7 +14,10 @@ #include <vector> -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libcn/hosted-neurons.cc b/upstream/src/libcn/hosted-neurons.cc index 14f2efe..74d0eaa 100644 --- a/upstream/src/libcn/hosted-neurons.cc +++ b/upstream/src/libcn/hosted-neurons.cc @@ -18,7 +18,10 @@ #include "types.hh" #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + CNRun::C_HostedNeuron:: C_HostedNeuron( TUnitType intype, const char *inlabel, diff --git a/upstream/src/libcn/hosted-neurons.hh b/upstream/src/libcn/hosted-neurons.hh index ad9eab2..7ec0308 100644 --- a/upstream/src/libcn/hosted-neurons.hh +++ b/upstream/src/libcn/hosted-neurons.hh @@ -13,13 +13,15 @@ #ifndef LIBCN_HOSTED_NEURONS_H #define LIBCN_HOSTED_NEURONS_H -#include "config.h" - #include "gsl/gsl_math.h" #include "base-neuron.hh" #include "hosted-attr.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + namespace CNRun { class CModel; diff --git a/upstream/src/libcn/hosted-synapses.cc b/upstream/src/libcn/hosted-synapses.cc index d1895a5..08a6dd6 100644 --- a/upstream/src/libcn/hosted-synapses.cc +++ b/upstream/src/libcn/hosted-synapses.cc @@ -17,7 +17,9 @@ #include "types.hh" #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/hosted-synapses.hh b/upstream/src/libcn/hosted-synapses.hh index f15da6a..56b0c7f 100644 --- a/upstream/src/libcn/hosted-synapses.hh +++ b/upstream/src/libcn/hosted-synapses.hh @@ -23,7 +23,10 @@ #include "hosted-neurons.hh" #include "standalone-neurons.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libcn/integrate-base.hh b/upstream/src/libcn/integrate-base.hh index 6e20f80..928802c 100644 --- a/upstream/src/libcn/integrate-base.hh +++ b/upstream/src/libcn/integrate-base.hh @@ -13,7 +13,10 @@ #ifndef LIBCN_INTEGRATE_BASE_H #define LIBCN_INTEGRATE_BASE_H -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + namespace CNRun { diff --git a/upstream/src/libcn/integrate-rk65.hh b/upstream/src/libcn/integrate-rk65.hh index 97c1993..51c3360 100644 --- a/upstream/src/libcn/integrate-rk65.hh +++ b/upstream/src/libcn/integrate-rk65.hh @@ -16,7 +16,9 @@ #include <vector> #include "integrate-base.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif namespace CNRun { diff --git a/upstream/src/libcn/model-cycle.cc b/upstream/src/libcn/model-cycle.cc index 7f8318d..32b2098 100644 --- a/upstream/src/libcn/model-cycle.cc +++ b/upstream/src/libcn/model-cycle.cc @@ -19,7 +19,9 @@ #include "integrate-rk65.hh" #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/model-nmlio.cc b/upstream/src/libcn/model-nmlio.cc index 79e8eb2..34cdda2 100644 --- a/upstream/src/libcn/model-nmlio.cc +++ b/upstream/src/libcn/model-nmlio.cc @@ -14,7 +14,9 @@ #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/model-struct.cc b/upstream/src/libcn/model-struct.cc index 8feecd0..b4f86ee 100644 --- a/upstream/src/libcn/model-struct.cc +++ b/upstream/src/libcn/model-struct.cc @@ -20,7 +20,10 @@ #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libcn/model.hh b/upstream/src/libcn/model.hh index 851b7b6..017209e 100644 --- a/upstream/src/libcn/model.hh +++ b/upstream/src/libcn/model.hh @@ -41,7 +41,9 @@ parameters. #include "standalone-synapses.hh" #include "integrate-rk65.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/mx-attr.hh b/upstream/src/libcn/mx-attr.hh index 0c88fe3..c3b0b3d 100644 --- a/upstream/src/libcn/mx-attr.hh +++ b/upstream/src/libcn/mx-attr.hh @@ -14,7 +14,9 @@ #include <vector> -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/param-unit-literals.hh b/upstream/src/libcn/param-unit-literals.hh index 592d16b..6bbfa5f 100644 --- a/upstream/src/libcn/param-unit-literals.hh +++ b/upstream/src/libcn/param-unit-literals.hh @@ -10,7 +10,10 @@ #ifndef LIBCN_PARAM_UNIT_LITERALS_H #define LIBCN_PARAM_UNIT_LITERALS_H -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + #define __CN_PU_CONDUCTANCE "\316\274S/cm\302\262" #define __CN_PU_RESISTANCE "M\316\251" diff --git a/upstream/src/libcn/sources.cc b/upstream/src/libcn/sources.cc index f86aca8..805cf15 100644 --- a/upstream/src/libcn/sources.cc +++ b/upstream/src/libcn/sources.cc @@ -17,7 +17,9 @@ #include "sources.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif using namespace std; diff --git a/upstream/src/libcn/sources.hh b/upstream/src/libcn/sources.hh index f3466d0..fbc99bc 100644 --- a/upstream/src/libcn/sources.hh +++ b/upstream/src/libcn/sources.hh @@ -17,7 +17,10 @@ #include "gsl/gsl_rng.h" #include "gsl/gsl_randist.h" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libcn/standalone-attr.hh b/upstream/src/libcn/standalone-attr.hh index 62c7b9d..4b6e086 100644 --- a/upstream/src/libcn/standalone-attr.hh +++ b/upstream/src/libcn/standalone-attr.hh @@ -15,7 +15,10 @@ #include <vector> -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; namespace CNRun { diff --git a/upstream/src/libcn/standalone-neurons.cc b/upstream/src/libcn/standalone-neurons.cc index 4ff60ca..1b00391 100644 --- a/upstream/src/libcn/standalone-neurons.cc +++ b/upstream/src/libcn/standalone-neurons.cc @@ -16,7 +16,9 @@ #include "types.hh" #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif diff --git a/upstream/src/libcn/standalone-neurons.hh b/upstream/src/libcn/standalone-neurons.hh index 420010b..70168f0 100644 --- a/upstream/src/libcn/standalone-neurons.hh +++ b/upstream/src/libcn/standalone-neurons.hh @@ -16,7 +16,9 @@ #include "standalone-attr.hh" #include "mx-attr.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif namespace CNRun { diff --git a/upstream/src/libcn/standalone-synapses.cc b/upstream/src/libcn/standalone-synapses.cc index f786d90..79eed22 100644 --- a/upstream/src/libcn/standalone-synapses.cc +++ b/upstream/src/libcn/standalone-synapses.cc @@ -17,7 +17,10 @@ #include "types.hh" #include "model.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + CNRun::C_StandaloneSynapse:: diff --git a/upstream/src/libcn/standalone-synapses.hh b/upstream/src/libcn/standalone-synapses.hh index 7550927..e4b08c2 100644 --- a/upstream/src/libcn/standalone-synapses.hh +++ b/upstream/src/libcn/standalone-synapses.hh @@ -20,7 +20,9 @@ #include "standalone-attr.hh" #include "mx-attr.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif namespace CNRun { diff --git a/upstream/src/libcn/types.cc b/upstream/src/libcn/types.cc index d8deb9b..deabf59 100644 --- a/upstream/src/libcn/types.cc +++ b/upstream/src/libcn/types.cc @@ -19,7 +19,10 @@ #include "types.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libcn/types.hh b/upstream/src/libcn/types.hh index fc05bee..7d2a328 100644 --- a/upstream/src/libcn/types.hh +++ b/upstream/src/libcn/types.hh @@ -15,7 +15,10 @@ #ifndef LIBCN_TYPES_H #define LIBCN_TYPES_H -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; namespace CNRun { diff --git a/upstream/src/libstilton/exprparser.cc b/upstream/src/libstilton/exprparser.cc index 4240d81..1d8f051 100644 --- a/upstream/src/libstilton/exprparser.cc +++ b/upstream/src/libstilton/exprparser.cc @@ -14,10 +14,12 @@ #include <array> #include <iostream> -#include "config.h" - #include "exprparser.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libstilton/exprparser.hh b/upstream/src/libstilton/exprparser.hh index 1a57045..e89d4c2 100644 --- a/upstream/src/libstilton/exprparser.hh +++ b/upstream/src/libstilton/exprparser.hh @@ -16,6 +16,10 @@ #include <string> #include <list> +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + namespace Stilton { using namespace std; diff --git a/upstream/src/libstilton/log-facility.cc b/upstream/src/libstilton/log-facility.cc index be7fc86..7b9cce2 100644 --- a/upstream/src/libstilton/log-facility.cc +++ b/upstream/src/libstilton/log-facility.cc @@ -13,10 +13,12 @@ #include <cmath> #include <fstream> -#include "config.h" - #include "log-facility.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/libstilton/log-facility.hh b/upstream/src/libstilton/log-facility.hh index e48c807..4c9dde5 100644 --- a/upstream/src/libstilton/log-facility.hh +++ b/upstream/src/libstilton/log-facility.hh @@ -13,6 +13,9 @@ #include <cstdarg> #include <fstream> +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif //#include <boost/interprocess/sync/interprocess_mutex.hpp> //#include <boost/interprocess/sync/interprocess_condition.hpp> diff --git a/upstream/src/libstilton/pointaligned-s.cc b/upstream/src/libstilton/pointaligned-s.cc index 804303b..482f633 100644 --- a/upstream/src/libstilton/pointaligned-s.cc +++ b/upstream/src/libstilton/pointaligned-s.cc @@ -11,10 +11,12 @@ #include <cfloat> #include <cstdio> -#include "config.h" - #include "pointaligned-s.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; inline namespace { diff --git a/upstream/src/libstilton/pointaligned-s.hh b/upstream/src/libstilton/pointaligned-s.hh index d2a0c75..a9e9d72 100644 --- a/upstream/src/libstilton/pointaligned-s.hh +++ b/upstream/src/libstilton/pointaligned-s.hh @@ -10,6 +10,10 @@ #ifndef CNAUX_POINTALIGN_H #define CNAUX_POINTALIGN_H +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + namespace Stilton { const char* diff --git a/upstream/src/tools/hh-latency-estimator.cc b/upstream/src/tools/hh-latency-estimator.cc index 53384ec..a90cea9 100644 --- a/upstream/src/tools/hh-latency-estimator.cc +++ b/upstream/src/tools/hh-latency-estimator.cc @@ -14,7 +14,9 @@ #include "libcn/model.hh" #include "libcn/types.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif CModel *Model; diff --git a/upstream/src/tools/spike2sdf.cc b/upstream/src/tools/spike2sdf.cc index 7791a86..91de7f7 100644 --- a/upstream/src/tools/spike2sdf.cc +++ b/upstream/src/tools/spike2sdf.cc @@ -17,6 +17,10 @@ #include <cstring> #include <cmath> +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; int diff --git a/upstream/src/tools/varfold.cc b/upstream/src/tools/varfold.cc index 3c82cda..7a2bdf1 100644 --- a/upstream/src/tools/varfold.cc +++ b/upstream/src/tools/varfold.cc @@ -22,6 +22,10 @@ #include <valarray> #include <numeric> +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit