From 1e7792242690475c7de6c3d39cb28d0a6f8e30d1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 7 Oct 2015 22:38:55 +0200
Subject: [PATCH] inline some vector element accessors
---
pub/lib/obj.hpp | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/pub/lib/obj.hpp b/pub/lib/obj.hpp
index ca63e78a..65d7f300 100644
--- a/pub/lib/obj.hpp
+++ b/pub/lib/obj.hpp
@@ -51,15 +51,15 @@ class CObjInt : public CObjNum {
int val; //!< Scalar value.
CObjInt( int _val ) : CObjNum(), val(_val) {};
// PObj clone() const { return PObjInt( new CObjInt( *this ) ); };
- bool has_err() const { return false; };
- char base_type() const { return 'i'; };
+ inline bool has_err() const { return false; };
+ inline char base_type() const { return 'i'; };
string result_info() const { return "CObjInt("+S(val)+")"; };
- double to_r() const { return val; };
- double to_r( int i ) const { return val; };
- int to_i() const { return val; };
- int to_i( int i ) const { return val; };
+ inline double to_r() const { return val; };
+ inline double to_r( int i ) const { return val; };
+ inline int to_i() const { return val; };
+ inline int to_i( int i ) const { return val; };
string to_s( int maxlen=12, int minlen=1, int prec=6 ) const;
- bool to_b() const { return val; };
+ inline bool to_b() const { return val; };
};
//! Data container holding a single floating-point number.
@@ -69,11 +69,11 @@ class CObjDbl : public CObjNum {
double val; //!< Scalar value.
CObjDbl( double _val=NAN ) : CObjNum(), val(_val) {};
// PObj clone() const { return PObjDbl( new CObjDbl( *this ) ); };
- bool has_err() const { return false; };
- char base_type() const { return 'd'; };
+ inline bool has_err() const { return false; };
+ inline char base_type() const { return 'd'; };
string result_info() const;
- double to_r() const { return val; };
- double to_r( int i ) const { return val; };
+ inline double to_r() const { return val; };
+ inline double to_r( int i ) const { return val; };
string to_s( int maxlen=12, int minlen=1, int prec=6 ) const;
bool to_b() const { return val; };
};
@@ -86,13 +86,13 @@ class CObjEnu : public CObjDbl {
double err; //!< Error of scalar value.
CObjEnu( double _val=NAN, double _err=NAN ) : CObjDbl(_val), err(_err) {};
// PObj clone() const { return PObjEnu( new CObjEnu( *this ) ); };
- bool has_err() const { return true; };
- char base_type() const { return 'e'; };
+ inline bool has_err() const { return true; };
+ inline char base_type() const { return 'e'; };
string result_info() const;
- double to_r() const { return val; };
- double to_dr() const { return err; } ;
- double to_r( int i ) const { return val; };
- double to_dr( int i ) const { return err; } ;
+ inline double to_r() const { return val; };
+ inline double to_dr() const { return err; } ;
+ inline double to_r( int i ) const { return val; };
+ inline double to_dr( int i ) const { return err; } ;
string to_s( int maxlen=12, int minlen=1, int prec=6 ) const;
bool to_b() const { return val; };
};
@@ -144,8 +144,8 @@ class CObjVecInt : public CObjVecNum {
bool has_err() const { return false; };
char base_type() const { return 'i'; };
string result_info() const;
- int to_i( int i ) const { return v[i]; };
- double to_r( int i ) const { return v[i]; };
+ inline int to_i( int i ) const { return v[i]; };
+ inline double to_r( int i ) const { return v[i]; };
string to_s( int maxlen=12, int minlen=1, int prec=6 ) const;
bool to_b() const { return v.size(); };
int size() const { return v.size(); };
@@ -163,7 +163,7 @@ class CObjVecDbl : public CObjVecNum {
bool has_err() const { return false; };
char base_type() const { return 'd'; };
string result_info() const;
- double to_r( int i ) const { return v[i]; };
+ inline double to_r( int i ) const { return v[i]; };
string to_s( int maxlen=12, int minlen=1, int prec=6 ) const;
bool to_b() const { return v.size(); };
int size() const { return v.size(); };
@@ -181,7 +181,7 @@ class CObjVecEnu : public CObjVecDbl {
bool has_err() const { return true; };
char base_type() const { return 'e'; };
string result_info() const;
- double to_dr( int i ) const { return dv[i]; } ;
+ inline double to_dr( int i ) const { return dv[i]; } ;
string to_s( int maxlen=12, int minlen=1, int prec=6 ) const;
bool to_b() const { return v.size(); };
int size() const { return v.size(); };
--
GitLab