Refactoring, rename isNil to isNull.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 3 deletions

diff --git a/sca-cpp/trunk/modules/opencl/driver.hpp b/sca-cpp/trunk/modules/opencl/driver.hpp
index c45bcf6ee4..f60e9c1dd3 100644
--- a/sca-cpp/trunk/modules/opencl/driver.hpp
+++ b/sca-cpp/trunk/modules/opencl/driver.hpp
@@ -38,7 +38,7 @@ namespace opencl {
 const value evalDriverLoop(const OpenCLProgram& clprog, istream& in, ostream& out, const OpenCLContext& cl) {
     scheme::promptForInput(scheme::evalInputPrompt, out);
     const value input = content(scheme::readValue(in));
-    if (isNil(input))
+    if (isNull(input))
         return input;
     const failable<value> output = evalKernel(createKernel(input, clprog), input, 1, value::String, 512, cl);
     scheme::announceOutput(scheme::evalOutputPrompt, out);
diff --git a/sca-cpp/trunk/modules/opencl/eval.hpp b/sca-cpp/trunk/modules/opencl/eval.hpp
index f842ba783d..e910d427bc 100644
--- a/sca-cpp/trunk/modules/opencl/eval.hpp
+++ b/sca-cpp/trunk/modules/opencl/eval.hpp
@@ -412,7 +412,7 @@ const failable<OpenCLBuffer> readOnlyBuffer(const size_t size, const void* const
  * Fill an array of write events for a given list of buffers.
  */
 const cl_uint writeBufferEvents(const list<OpenCLBuffer>& buf, cl_event* const evt) {
-    if (isNil(buf))
+    if (isNull(buf))
         return 0;
     const cl_event e = car(buf).evt;
     if (e == 0)
@@ -486,7 +486,7 @@ const failable<OpenCLBuffer> valueToKernelArg(const value& v, const cl_uint i, c
  * Convert a list of values to kernel args.
  */
 const failable<list<OpenCLBuffer>> valuesToKernelArgsListHelper(const list<value>& v, const cl_uint i, const OpenCLKernel& kernel, const OpenCLContext& cl, const cl_command_queue cq) {
-    if (isNil(v))
+    if (isNull(v))
         return list<OpenCLBuffer>();
     const failable<OpenCLBuffer> a = valueToKernelArg(car(v), i, kernel, cl, cq);
     if (!hasContent(a))