Changing overloaded createHandle appropriate function names

pavanky · pavanky · commit 7bc107154cb3 · 2015-02-23T13:20:16.000-05:00
- Added createHandleFromValue
- Added createHandleFromData
diff --git a/src/api/c/data.cpp b/src/api/c/data.cpp
@@ -19,7 +19,6 @@
 #include <handle.hpp>
 #include <random.hpp>
 #include <math.hpp>
-#include <complex.hpp>
 #include <iota.hpp>
 #include <identity.hpp>
 #include <diagonal.hpp>
@@ -63,16 +62,16 @@ af_err af_create_array(af_array *result, const void * const data,
             d[i] = dims[i];
         }
         switch(type) {
-        case f32:   out = createHandle(d, static_cast<const float   *>(data)); break;
-        case c32:   out = createHandle(d, static_cast<const cfloat  *>(data)); break;
-        case f64:   out = createHandle(d, static_cast<const double  *>(data)); break;
-        case c64:   out = createHandle(d, static_cast<const cdouble *>(data)); break;
-        case b8:    out = createHandle(d, static_cast<const char    *>(data)); break;
-        case s32:   out = createHandle(d, static_cast<const int     *>(data)); break;
-        case u32:   out = createHandle(d, static_cast<const uint    *>(data)); break;
-        case u8:    out = createHandle(d, static_cast<const uchar   *>(data)); break;
-        case s64:   out = createHandle(d, static_cast<const intl    *>(data)); break;
-        case u64:   out = createHandle(d, static_cast<const uintl   *>(data)); break;
+        case f32:   out = createHandleFromData(d, static_cast<const float   *>(data)); break;
+        case c32:   out = createHandleFromData(d, static_cast<const cfloat  *>(data)); break;
+        case f64:   out = createHandleFromData(d, static_cast<const double  *>(data)); break;
+        case c64:   out = createHandleFromData(d, static_cast<const cdouble *>(data)); break;
+        case b8:    out = createHandleFromData(d, static_cast<const char    *>(data)); break;
+        case s32:   out = createHandleFromData(d, static_cast<const int     *>(data)); break;
+        case u32:   out = createHandleFromData(d, static_cast<const uint    *>(data)); break;
+        case u8:    out = createHandleFromData(d, static_cast<const uchar   *>(data)); break;
+        case s64:   out = createHandleFromData(d, static_cast<const intl    *>(data)); break;
+        case u64:   out = createHandleFromData(d, static_cast<const uintl   *>(data)); break;
         default:    TYPE_ERROR(4, type);
         }
         std::swap(*result, out);
@@ -94,16 +93,16 @@ af_err af_constant(af_array *result, const double value,
             d[i] = dims[i];
         }
         switch(type) {
-        case f32:   out = createHandle<float  >(d, value); break;
-        case c32:   out = createHandle<cfloat >(d, value); break;
-        case f64:   out = createHandle<double >(d, value); break;
-        case c64:   out = createHandle<cdouble>(d, value); break;
-        case b8:    out = createHandle<char   >(d, value); break;
-        case s32:   out = createHandle<int    >(d, value); break;
-        case u32:   out = createHandle<uint   >(d, value); break;
-        case u8:    out = createHandle<uchar  >(d, value); break;
-        case s64:   out = createHandle<intl   >(d, value); break;
-        case u64:   out = createHandle<uintl  >(d, value); break;
+        case f32:   out = createHandleFromValue<float  >(d, value); break;
+        case c32:   out = createHandleFromValue<cfloat >(d, value); break;
+        case f64:   out = createHandleFromValue<double >(d, value); break;
+        case c64:   out = createHandleFromValue<cdouble>(d, value); break;
+        case b8:    out = createHandleFromValue<char   >(d, value); break;
+        case s32:   out = createHandleFromValue<int    >(d, value); break;
+        case u32:   out = createHandleFromValue<uint   >(d, value); break;
+        case u8:    out = createHandleFromValue<uchar  >(d, value); break;
+        case s64:   out = createHandleFromValue<intl   >(d, value); break;
+        case u64:   out = createHandleFromValue<uintl  >(d, value); break;
         default:    TYPE_ERROR(4, type);
         }
         std::swap(*result, out);
diff --git a/src/api/c/handle.hpp b/src/api/c/handle.hpp
@@ -46,13 +46,13 @@ static af_array createHandle(af::dim4 d)
 }
 
 template<typename T>
-static af_array createHandle(af::dim4 d, double val)
+static af_array createHandleFromValue(af::dim4 d, double val)
 {
     return getHandle(*detail::createValueArray<T>(d, detail::scalar<T>(val)));
 }
 
 template<typename T>
-static af_array createHandle(af::dim4 d, const T * const data)
+static af_array createHandleFromData(af::dim4 d, const T * const data)
 {
     return getHandle(*detail::createHostDataArray<T>(d, data));
 }

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,13 @@ static af_array createHandle(af::dim4 d)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`template<typename T>`
`49`		`-static af_array createHandle(af::dim4 d, double val)`
	`49`	`+static af_array createHandleFromValue(af::dim4 d, double val)`
`50`	`50`	`{`
`51`	`51`	`return getHandle(*detail::createValueArray<T>(d, detail::scalar<T>(val)));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`template<typename T>`
`55`		`-static af_array createHandle(af::dim4 d, const T * const data)`
	`55`	`+static af_array createHandleFromData(af::dim4 d, const T * const data)`
`56`	`56`	`{`
`57`	`57`	`return getHandle(*detail::createHostDataArray<T>(d, data));`
`58`	`58`	`}`