[med-svn] [cnrun] 02/14: mark functions ((pure)) or ((const)) as suggested by -Wsuggest-attribute

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository cnrun.

commit 9e87ab796d099901cd624d60243c1e94911472e1
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Nov 29 17:07:08 2014 +0200

    mark functions ((pure)) or ((const)) as suggested by -Wsuggest-attribute
---
 upstream/src/libcnrun/base-neuron.hh  |  4 ++--
 upstream/src/libcnrun/sources.hh      |  5 +++--
 upstream/src/libstilton/containers.hh | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/upstream/src/libcnrun/base-neuron.hh b/upstream/src/libcnrun/base-neuron.hh
index e1ff426..603b692 100644
--- a/upstream/src/libcnrun/base-neuron.hh
+++ b/upstream/src/libcnrun/base-neuron.hh
@@ -90,7 +90,7 @@ class C_BaseNeuron
         size_t dendrites() const        { return _dendrites.size(); }
 
         bool
-        connects_to( const C_BaseNeuron &to) const;
+        connects_to( const C_BaseNeuron &to) const __attribute__ ((pure));
 
         C_BaseSynapse*
         connects_via( const C_BaseNeuron &to,
@@ -224,7 +224,7 @@ struct SSpikeloggerService {
                         spike_history.clear();
                 }
 
-        size_t n_spikes_since( double since = 0.) const;
+        size_t n_spikes_since( double since = 0.) const  __attribute__ ((pure));
 
       // spike density function
         double sdf( double at, double sample_length, double sigma,
diff --git a/upstream/src/libcnrun/sources.hh b/upstream/src/libcnrun/sources.hh
index 7caa63c..a6e3c32 100644
--- a/upstream/src/libcnrun/sources.hh
+++ b/upstream/src/libcnrun/sources.hh
@@ -37,7 +37,8 @@ class C_BaseSource {
         DELETE_DEFAULT_METHODS (C_BaseSource)
 
     public:
-        static const char* const type_s( TSourceType);
+        static const char* const
+        type_s( TSourceType) __attribute__ ((const));
 
         C_BaseSource (const string& name_, TSourceType type_)
               : _name (name_), _type (type_)
@@ -168,7 +169,7 @@ class CSourceNoise : public C_BaseSource {
 
     public:
         enum class TDistribution { uniform, gaussian, };
-        static const char * const distribution_s( TDistribution);
+        static const char * const distribution_s( TDistribution) __attribute__ ((const));
         static TDistribution distribution_by_name( const string&);
 
         CSourceNoise (const string& name_, double min_ = 0., double max_ = 1.,
diff --git a/upstream/src/libstilton/containers.hh b/upstream/src/libstilton/containers.hh
index df25c56..41b40b1 100644
--- a/upstream/src/libstilton/containers.hh
+++ b/upstream/src/libstilton/containers.hh
@@ -29,6 +29,10 @@ namespace alg {
 
 template <typename T>
 bool
+member( const T&, const list<T>&) __attribute__ ((pure));
+
+template <typename T>
+bool
 member( const T& x, const list<T>& v)
 {
         return find( v.begin(), v.end(), x) != v.end();
@@ -36,6 +40,10 @@ member( const T& x, const list<T>& v)
 
 template <typename T>
 bool
+member( const T&, const forward_list<T>&) __attribute__ ((pure));
+
+template <typename T>
+bool
 member( const T& x, const forward_list<T>& v)
 {
         return find( v.begin(), v.end(), x) != v.end();
@@ -43,6 +51,10 @@ member( const T& x, const forward_list<T>& v)
 
 template <typename T>
 bool
+member( const T&, const vector<T>&) __attribute__ ((pure));
+
+template <typename T>
+bool
 member( const T& x, const vector<T>& v)
 {
         return find( v.begin(), v.end(), x) != v.end();
@@ -50,6 +62,10 @@ member( const T& x, const vector<T>& v)
 
 template <typename K, typename V>
 bool
+member( const K&, const map<K, V>&) __attribute__ ((pure));
+
+template <typename K, typename V>
+bool
 member( const K& x, const map<K, V>& m)
 {
         return m.find(x) != m.end();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git