diff options
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JGadget/search.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio/functionvalue.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index e4c5c538b7..c53045668a 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -111,14 +111,14 @@ inline Iterator findUpperBound_binary_end(Iterator first, Iterator last, const T } template <typename Iterator, typename T, typename Predicate> -Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val, Predicate p) { +inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val, Predicate p) { return current == last || p(val, *current) ? findUpperBound_binary_end(first, current, val, p) : findUpperBound_binary_begin(current, last, val, p); } template <typename Iterator, typename T> -Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val) { +inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val) { return findUpperBound_binary_current(first, last, current, val, std::less<T>()); } diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 69309a4219..a8724f5496 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -157,7 +157,6 @@ private: class TFunctionValue_constant : public TFunctionValue { public: TFunctionValue_constant(); - virtual ~TFunctionValue_constant() {} virtual u32 getType() const; virtual TFunctionValueAttributeSet getAttributeSet(); @@ -195,7 +194,6 @@ public: const TFunctionValue_composite::TData&, f64); TFunctionValue_composite(); - virtual ~TFunctionValue_composite() {} virtual u32 getType() const; virtual TFunctionValueAttributeSet getAttributeSet(); @@ -232,7 +230,6 @@ class TFunctionValue_transition : public TFunctionValue, public TFunctionValueAttribute_interpolate { public: TFunctionValue_transition(); - virtual ~TFunctionValue_transition() {} virtual u32 getType() const; virtual TFunctionValueAttributeSet getAttributeSet(); @@ -264,7 +261,6 @@ public: typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list&, const TIndexData_&); TFunctionValue_list(); - virtual ~TFunctionValue_list() {} virtual u32 getType() const; virtual TFunctionValueAttributeSet getAttributeSet(); @@ -380,7 +376,6 @@ public: typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list_parameter&, f64); TFunctionValue_list_parameter(); - virtual ~TFunctionValue_list_parameter() {} virtual u32 getType() const; virtual TFunctionValueAttributeSet getAttributeSet(); @@ -499,7 +494,6 @@ public: }; TFunctionValue_hermite(); - virtual ~TFunctionValue_hermite() {} virtual u32 getType() const; virtual TFunctionValueAttributeSet getAttributeSet(); |
