Changeset 805

Timestamp:

06/09/18 08:21:52 (6 years ago)

Author:

Maciej Komosinski

Message:

Fixed clang's compiler forward declaration problem - not using ExtValue? in param.h (template moved to param.cpp)

Location:

cpp/frams/param

Files:

• param.cpp (modified) (6 diffs)
• param.h (modified) (1 diff)

cpp/frams/param/param.cpp

@@ -422 +422 @@
 }
 
-void SimpleAbstractParam::messageOnExceedRangeExtValue(int i, int setflags, ExtValue& valuetoset) ///< prints a warning when setflags indicates that allowed param range has been exceeded during set
+template<typename T> void messageOnExceedRange(SimpleAbstractParam *pi, int i, int setflags, T valuetoset) ///< prints a warning when setflags indicates that allowed param range has been exceeded during set
+{
+        if (setflags & (PSET_HITMIN | PSET_HITMAX))
+        {
+                ExtValue v(valuetoset);
+                pi->messageOnExceedRange(i, setflags, v);
+        }
+}
+
+void SimpleAbstractParam::messageOnExceedRange(int i, int setflags, ExtValue& valuetoset) ///< prints a warning when setflags indicates that allowed param range has been exceeded during set
 {
         if (setflags & (PSET_HITMIN | PSET_HITMAX))
@@ -1038 +1047 @@
                 }
         }
-        messageOnExceedRange(i, result, xcopy);
+        ::messageOnExceedRange(this, i, result, xcopy);
         return result;
 }
@@ -1072 +1081 @@
                 }
         }
-        messageOnExceedRange(i, result, xcopy);
+        ::messageOnExceedRange(this, i, result, xcopy);
         return result;
 }
@@ -1113 +1122 @@
                 }
         }
-        messageOnExceedRange(i, result, xcopy);
+        ::messageOnExceedRange(this, i, result, xcopy);
         return result;
 }
@@ -1144 +1153 @@
                 v.setObject(x);
                 int result = (*(int(*)(void*, const ExtValue*))pe->fun2)(object, &v);
-                messageOnExceedRange(i, result, xcopy);
+                ::messageOnExceedRange(this, i, result, xcopy);
                 return result;
         }
@@ -1164 +1173 @@
         {
                 int result = (*(int(*)(void*, const ExtValue*))pe->fun2)(object, &x);
-                messageOnExceedRange(i, result, xcopy);
+                ::messageOnExceedRange(this, i, result, xcopy);
                 return result;
         }

cpp/frams/param/param.h

@@ -291 +291 @@
         ExtValue getExtValue(int);
 
-        template<typename T> void messageOnExceedRange(int i, int setflags, T valuetoset) ///< prints a warning when setflags indicates that allowed param range has been exceeded during set
-        {
-                if (setflags & (PSET_HITMIN | PSET_HITMAX))
-                {
-                        ExtValue v(valuetoset);
-                        messageOnExceedRangeExtValue(i, setflags, v);
-                }
-        }
-        void messageOnExceedRangeExtValue(int i, int setflags, ExtValue& valuetoset); ///< used by messageOnExceedRange() internally
-
+        void messageOnExceedRange(int i, int setflags, ExtValue& valuetoset);
         int setInt(int, paInt);
         int setDouble(int, double);