Opened 3 years ago

Closed 3 years ago

#12741 closed bug (fixed)

[Patch] LocaleRoster.cpp: fix gcc6 build

Reported by: mt Owned by: pulkomandy
Priority: normal Milestone: Unscheduled
Component: Kits/Locale Kit Version: R1/Development
Keywords: Cc:
Blocked By: Blocking:
Has a Patch: yes Platform: All

Description

In _InitializeCatalog(), gcc6 warns '-Werror=misleading-indentation'. I think we don't need ";" after if() at line 544.

C++ /home/haiku/haiku/haiku/generated-gcc6/objects/haiku/x86/release/kits/locale/LocaleRoster.o 
/home/haiku/haiku/haiku/src/kits/locale/LocaleRoster.cpp: In function 'status_t _InitializeCatalog(void*)':
/home/haiku/haiku/haiku/src/kits/locale/LocaleRoster.cpp:544:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
  if (BEntry(info.name).GetRef(&ref) == B_OK && catalog->SetTo(ref) == B_OK);
  ^~
/home/haiku/haiku/haiku/src/kits/locale/LocaleRoster.cpp:545:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
   return B_OK;
   ^~~~~~
cc1plus: all warnings being treated as errors

Attachments (1)

0002-LocaleRoster.cpp-fix-gcc6-build.patch (800 bytes ) - added by mt 3 years ago.

Download all attachments as: .zip

Change History (4)

comment:1 by mt, 3 years ago

Has a Patch: set

comment:2 by pulkomandy, 3 years ago

+1, but internet connectivity problems at home prevents me from commiting at the moment. Anyone feel free to merge.

comment:3 by korli, 3 years ago

Resolution: fixed
Status: newclosed

Applied in hrev50279.

Note: See TracTickets for help on using tickets.