Merge pull request #5622 from ghalliday/issue11119

HPCC-11119 Fix some warnings in the generated code Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Apr 8, 2014 · cb86c0e · cb86c0e
2 parents 6db2647 + 27907b8
commit cb86c0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ecl/hqlcpp/hqlhtcpp.cpp b/ecl/hqlcpp/hqlhtcpp.cpp
@@ -2356,6 +2356,10 @@ void ActivityInstance::addConstructorMetaParameter()
         OwnedHqlExpr metaExpr = createQuoted(s.str(), makeBoolType());
         constructorArgs.append(*metaExpr.getClear());
     }
+    else if ((kind == TAKwhen_action) || (kind == TAKemptyaction))
+    {
+        constructorArgs.append(*createTranslatedOwned(createValue(no_nullptr, makeBoolType())));
+    }
 }
 
 ParentExtract * ActivityInstance::createNestedExtract()
@@ -11147,7 +11151,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityPipeThrough(BuildCtx & ctx, IH
     if (expr->hasAttribute(repeatAtom))
     {
         //virtual const char * getPipeProgram() { return "grep"; }
-        instance->startctx.addQuoted("virtual char * getPipeProgram() { return NULL; }");
+        instance->startctx.addQuoted("virtual const char * getPipeProgram() { return NULL; }");
 
         BuildCtx pipeCtx(instance->startctx);
         pipeCtx.addQuotedCompound("virtual char * getNameFromRow(const void * _self)");

diff --git a/plugins/stringlib/stringlib.cpp b/plugins/stringlib/stringlib.cpp
@@ -61,7 +61,7 @@ static const char * EclDefinition =
 "  string StringToProperCase(const string src) : c,pure,entrypoint='slStringToProperCase';\n"
 "  string StringToCapitalCase(const string src) : c,pure,entrypoint='slStringToCapitalCase';\n"
 "  string StringToTitleCase(const string src) : c,pure,entrypoint='slStringToTitleCase';\n"
-"  integer4 StringCompareIgnoreCase(const string src1, string src2) : c,pure,entrypoint='slStringCompareIgnoreCase';\n"
+"  integer4 StringCompareIgnoreCase(const string src1, const string src2) : c,pure,entrypoint='slStringCompareIgnoreCase';\n"
 "  string StringReverse(const string src) : c,pure,entrypoint='slStringReverse';\n"
 "  string StringFindReplace(const string src, const string stok, const string rtok) : c,pure,entrypoint='slStringFindReplace';\n"
 "  string StringCleanSpaces(const string src) : c,pure,entrypoint='slStringCleanSpaces'; \n"