|
@@ -217,6 +217,10 @@ namespace fv {
|
|
|
|
|
|
/** Calculate, if necessary, and return the value held by this object.
|
|
|
*/
|
|
|
+ virtual T &get() = 0;
|
|
|
+
|
|
|
+ /** Alias to get
|
|
|
+ */
|
|
|
virtual T &operator() () = 0;
|
|
|
};
|
|
|
|
|
@@ -244,7 +248,7 @@ namespace fv {
|
|
|
return name;
|
|
|
}
|
|
|
|
|
|
- T &operator() (){
|
|
|
+ T &get() {
|
|
|
if (!this->value_valid) {
|
|
|
if (fv_util::debug_on) {
|
|
|
std::cout << "Calculating Value: " << this->get_name() << std::endl;
|
|
@@ -253,6 +257,10 @@ namespace fv {
|
|
|
}
|
|
|
return *val_ref;
|
|
|
}
|
|
|
+
|
|
|
+ T &operator() (){
|
|
|
+ return this->get();
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
|
|
@@ -290,7 +298,7 @@ namespace fv {
|
|
|
DerivedValue(const std::string &name, const std::string &alias = "")
|
|
|
: Value<T>(name, alias) {}
|
|
|
|
|
|
- T &operator() () {
|
|
|
+ T &get() {
|
|
|
if (!this->value_valid) {
|
|
|
if (fv_util::debug_on) {
|
|
|
std::cout << "Calculating Value: " << this->get_name() << std::endl;
|
|
@@ -300,6 +308,10 @@ namespace fv {
|
|
|
}
|
|
|
return value;
|
|
|
}
|
|
|
+
|
|
|
+ T &operator() () {
|
|
|
+ return this->get();
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
|