Переглянути джерело

Merge pull request #6551 from ghalliday/issue12442

HPCC-12442 Fix compile warnings from implicit type casts

Reviewed-By: Jamie Noss <james.noss@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 роки тому
батько
коміт
fe8490bc27
3 змінених файлів з 5 додано та 5 видалено
  1. 2 2
      ecl/eclcc/eclcc.cpp
  2. 1 1
      ecl/hql/hqlopt.ipp
  3. 2 2
      ecl/hqlcpp/hqlecl.cpp

+ 2 - 2
ecl/eclcc/eclcc.cpp

@@ -1134,7 +1134,7 @@ void EclCC::processSingleQuery(EclCompileInstance & instance,
                 instance.query.setown(convertAttributeToQuery(instance.query, ctx));
 
             unsigned __int64 parseTimeNs = cycle_to_nanosec(get_cycles_now() - startCycles);
-            instance.stats.parseTime = nanoToMilli(parseTimeNs);
+            instance.stats.parseTime = (unsigned)nanoToMilli(parseTimeNs);
 
             if (instance.wu->getDebugValueBool("addTimingToWorkunit", true))
                 updateWorkunitTimeStat(instance.wu, SSTcompilestage, "compile:parseTime", StTimeElapsed, NULL, parseTimeNs);
@@ -1210,7 +1210,7 @@ void EclCC::processSingleQuery(EclCompileInstance & instance,
     }
 
     unsigned __int64 totalTimeNs = cycle_to_nanosec(get_cycles_now() - startCycles);
-    instance.stats.generateTime = nanoToMilli(totalTimeNs) - instance.stats.parseTime;
+    instance.stats.generateTime = (unsigned)nanoToMilli(totalTimeNs) - instance.stats.parseTime;
     //MORE: This is done too late..
     if (instance.wu->getDebugValueBool("addTimingToWorkunit", true))
         updateWorkunitTimeStat(instance.wu, SSTcompilestage, "compile", StTimeElapsed, NULL, totalTimeNs);

+ 1 - 1
ecl/hql/hqlopt.ipp

@@ -32,7 +32,7 @@ class OptTransformInfo : public NewTransformInfo
 public:
     OptTransformInfo(IHqlExpression * _expr) : NewTransformInfo(_expr) { useCount = 0; }
 
-    bool getStopHoist() { return spareByte1; }
+    bool getStopHoist() { return spareByte1 != 0; }
     void setStopHoist() { spareByte1 = true; }
 
 public:

+ 2 - 2
ecl/hqlcpp/hqlecl.cpp

@@ -486,7 +486,7 @@ void HqlDllGenerator::doExpand(HqlCppTranslator & translator)
         }
     }
 
-    unsigned elapsedCycles = get_cycles_now() - startCycles;
+    cycle_t elapsedCycles = get_cycles_now() - startCycles;
     if (wu->getDebugValueBool("addTimingToWorkunit", true))
         updateWorkunitTimeStat(wu, SSTcompilestage, "compile:write c++", StTimeElapsed, NULL, cycle_to_nanosec(elapsedCycles));
 }
@@ -546,7 +546,7 @@ bool HqlDllGenerator::doCompile(ICppCompiler * compiler)
     else
         PrintLog("Failed to compile %s", wuname);
 
-    unsigned elapsedCycles = get_cycles_now() - startCycles;
+    cycle_t elapsedCycles = get_cycles_now() - startCycles;
     //For eclcc the workunit has been written to the resource - so any further timings will not be preserved -> need to report differently
     queryActiveTimer()->addTiming("compile:compile c++", elapsedCycles);