Skip to content

Commit

Permalink
HPCC-31379 Fix new OSX 13 compiler warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Mar 1, 2024
1 parent 193e658 commit fb476a4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
3 changes: 3 additions & 0 deletions ecl/hql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)

#Compiler complains about an unused function yyunput, and make sure that any warnings are not reported as errors
set_source_files_properties (hqllex.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-function -Wno-error")

#Compiler complains about a variable is set but not used
set_source_files_properties (hqlgram.cpp PROPERTIES COMPILE_FLAGS " -Wunused-but-set-variable -Wno-error")
endif()

if (WIN32)
Expand Down
4 changes: 2 additions & 2 deletions ecl/hql/hqlexpr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1146,8 +1146,8 @@ void HqlParseContext::finishMeta(bool isSeparateFile, bool success, bool generat
{
#if 0
IPropertyTree* tos = curMeta().meta;
# This is disabled as the location of the cache file needs to be
# in the original location for now. This may re-visited in the future.
// This is disabled as the location of the cache file needs to be
// in the original location for now. This may re-visited in the future.
if (isSeparateFile && hasCacheLocation())
{
StringBuffer fullName;
Expand Down
4 changes: 4 additions & 0 deletions ecl/hqlcpp/hqlresource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5549,15 +5549,19 @@ void EclResourcer::removeDuplicateIndependentLinks(CSplitterInfo & connections,
ResourcerInfo & sinkInfo = *queryResourceInfo(sink);
if (allInputsPulledIndependently(sink))
{
#ifdef TRACE_BALANCED
unsigned numRemoved = 0;
#endif
for (unsigned j=info.balancedLinks.ordinality()-1; j > i; j--)
{
CSplitterLink & next = info.balancedLinks.item(j);
if (next.hasSource(expr) && next.hasSink(sink))
{
info.balancedLinks.remove(j);
sinkInfo.balancedLinks.zap(next);
#ifdef TRACE_BALANCED
numRemoved++;
#endif
}
}

Expand Down
2 changes: 0 additions & 2 deletions roxie/ccd/ccdqueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory

bool remove(RoxiePacketHeader &x)
{
unsigned scanLength = 0;
ISerializedRoxieQueryPacket *found = nullptr;
{
CriticalBlock qc(qcrit);
Expand All @@ -1273,7 +1272,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory
ISerializedRoxieQueryPacket *queued = waiting.item(i);
if (queued)
{
scanLength++;
if (queued->queryHeader().matchPacket(x))
{
waiting.set(i, NULL);
Expand Down
2 changes: 0 additions & 2 deletions system/jlib/jdebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3286,7 +3286,6 @@ void printProcMap(const char *fn, bool printbody, bool printsummary, StringBuffe
}
while (reader.nextln()) {
const char *ln = reader.ln;
unsigned n=0;
if (*ln) {
offset_t start = readHexNum(ln);
if (last&&(last!=start)) {
Expand Down Expand Up @@ -3360,7 +3359,6 @@ void printProcMap(const char *fn, bool printbody, bool printsummary, StringBuffe
recs[t].total += ssz;
if (ssz>recs[t].largest)
recs[t].largest = ssz;
n++;
last = end;
#ifndef __64BIT__
if ((end<0xffffffff)&&(end>=0xc0000000)) // rest is OS (32-bit only)
Expand Down
2 changes: 0 additions & 2 deletions tools/hidl/hidlcomp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2254,10 +2254,8 @@ void ModuleInfo::write_body_class()
}
outf("}, %d };\n\n",version);

int fn=0;
for (ProcInfo *pi=procs; pi; pi=pi->next)
{
fn++;
pi->write_body_method_structs2(name);
}
outs("\n");
Expand Down

0 comments on commit fb476a4

Please sign in to comment.