Changeset 1302

Timestamp:

Jul 27, 2004, 1:25:19 PM (22 years ago)

Author:

evanalst

Message:

Add check for input/output vectors are same type for sorting.

Location:

trunk/psLib/src

Files:

• collections/psVector.c (modified) (2 diffs)
• mathtypes/psVector.c (modified) (2 diffs)

trunk/psLib/src/collections/psVector.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-15 23:52:33 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-27 23:25:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -181 +181 @@
     }
 
+    if(inType != outVector->type.type) {
+        psError(__func__, " : Line %d - Input and output vectors are not same type: in=%d out=%d\n", __LINE__,
+                inType, outVector->type.type);
+        return outVector;
+    }
+
     if(inN == 0) {
         psError(__func__, " : Line %d - No elements in use for input vector\n", __LINE__);

trunk/psLib/src/mathtypes/psVector.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-15 23:52:33 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-27 23:25:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -181 +181 @@
     }
 
+    if(inType != outVector->type.type) {
+        psError(__func__, " : Line %d - Input and output vectors are not same type: in=%d out=%d\n", __LINE__,
+                inType, outVector->type.type);
+        return outVector;
+    }
+
     if(inN == 0) {
         psError(__func__, " : Line %d - No elements in use for input vector\n", __LINE__);