Changeset 1720 for code/branches/core3/src/core

Timestamp:

Sep 6, 2008, 6:30:40 PM (16 years ago)

Author:

landauf

Message:

bugfix + cleanup

Location:

code/branches/core3/src/core

Files:

• ConfigValueContainer.cc (modified) (2 diffs)
• Functor.h (modified) (2 diffs)

code/branches/core3/src/core/ConfigValueContainer.cc

@@ -153 +153 @@
         {
             return this->callFunctionWithIndex(&ConfigValueContainer::tset, input);
-        }
-        else
-        {
-//            MultiType temp = this->value_;
-//            if (temp.assimilate(input))
-//            {
-//                this->value_ = temp;
-                this->value_ = input;
-                if (this->identifier_)
-                    this->identifier_->updateConfigValues();
-
-                return true;
-//            }
-        }
-        return false;
+            return false;
+        }
+        else
+        {
+            this->value_ = input;
+
+            if (this->identifier_)
+                this->identifier_->updateConfigValues();
+
+            return true;
+        }
     }
 
@@ -194 +190 @@
             }
 
-//            MultiType temp = this->value_;
-//            if (temp.assimilate(input))
-//            {
-//                this->valueVector_[index] = temp;
-                this->valueVector_[index] = input;
-
-                if (this->identifier_)
-                    this->identifier_->updateConfigValues();
-
-                return true;
-//            }
+            this->valueVector_[index] = input;
+
+            if (this->identifier_)
+                this->identifier_->updateConfigValues();
+
+            return true;
         }
         else
         {
             COUT(1) << "Error: Config-value '" << this->varname_ << "' in " << this->sectionname_ << " is not a vector." << std::endl;
-        }
-        return false;
+            return false;
+        }
     }
 

code/branches/core3/src/core/Functor.h

@@ -280 +280 @@
 
 
-/*
-#define FUNCTOR_EVALUATE_PARAM(numparams) FUNCTOR_EVALUATE_PARAM##numparams
-#define FUNCTOR_EVALUATE_PARAM0
-#define FUNCTOR_EVALUATE_PARAM1 \
-    if (index == 0) { P1 temp = param; param = temp; }
-#define FUNCTOR_EVALUATE_PARAM2 \
-    if (index == 0) { P1 temp = param; param = temp; } \
-    else if (index == 1) { P2 temp = param; param = temp; }
-#define FUNCTOR_EVALUATE_PARAM3 \
-    if (index == 0) { P1 temp = param; param = temp; } \
-    else if (index == 1) { P2 temp = param; param = temp; } \
-    else if (index == 2) { P3 temp = param; param = temp; }
-#define FUNCTOR_EVALUATE_PARAM4 \
-    if (index == 0) { P1 temp = param; param = temp; } \
-    else if (index == 1) { P2 temp = param; param = temp; } \
-    else if (index == 2) { P3 temp = param; param = temp; } \
-    else if (index == 3) { P4 temp = param; param = temp; }
-#define FUNCTOR_EVALUATE_PARAM5 \
-    if (index == 0) { P1 temp = param; param = temp; } \
-    else if (index == 1) { P2 temp = param; param = temp; } \
-    else if (index == 2) { P3 temp = param; param = temp; } \
-    else if (index == 3) { P4 temp = param; param = temp; } \
-    else if (index == 4) { P5 temp = param; param = temp; }
-*/
+
 #define FUNCTOR_EVALUATE_PARAM(numparams) FUNCTOR_EVALUATE_PARAM##numparams
 #define FUNCTOR_EVALUATE_PARAM0
@@ -330 +307 @@
 
 
+
 #define CREATE_STATIC_FUNCTOR(returnvalue, numparams) \
     FUNCTOR_TEMPLATE(0, returnvalue, numparams) \