[mythtv-commits] [MythTV/mythtv] ed10be: Make servicesv2 template function name distinct.

[David Hampton]

  Branch: refs/heads/master
  Home:   https://github.com/MythTV/mythtv
  Commit: ed10befaa455de062c0a994cfb296ee47bf14eac
      https://github.com/MythTV/mythtv/commit/ed10befaa455de062c0a994cfb296ee47bf14eac
  Author: David Hampton <mythtv at love2code.net>
  Date:   2022-12-29 (Thu, 29 Dec 2022)

  Changed paths:
    M mythtv/programs/mythbackend/servicesv2/v2channel.cpp
    M mythtv/programs/mythbackend/servicesv2/v2serviceUtil.h

  Log Message:
  -----------
  Make servicesv2 template function name distinct.

Cmake and qmake take different approaches to building MOC files.
Qmake compiles individual moc files, whereas cmake concatenates all
the moc files into a single file and compiles that one file.  This
causes problems when there are multiple functions with the same name
that were previously in separate compilation units. Changing the
function name resolves the error.


  Commit: 2ccb3a73d9f5b1a4ab766acdb4bd460b3229735a
      https://github.com/MythTV/mythtv/commit/2ccb3a73d9f5b1a4ab766acdb4bd460b3229735a
  Author: David Hampton <mythtv at love2code.net>
  Date:   2022-12-29 (Thu, 29 Dec 2022)

  Changed paths:
    M mythtv/libs/libmythtv/tv_play.h

  Log Message:
  -----------
  Fix conflict with X11 global variable Time.

Cmake and qmake take different approaches to building MOC files.
Qmake compiles individual moc files, whereas cmake includes all the
moc files into a single file and compiles that one file.

This is causing a problem where X11/X.h is included by something
earlier in the libmythtv combined moc file, and then the moc version
of tv_play.h is included.  There is then a name conflict because X11
defines "Time" as a type and tv_play.h is using "Time" as a variable
name. I have no idea why this only affects the template function with
a variable named "Time", but doesn't also affect the two regular
functions with a variable named "Time".


  Commit: bcb4bd5db98ccba4ad978ebd94ad01d232c1c25f
      https://github.com/MythTV/mythtv/commit/bcb4bd5db98ccba4ad978ebd94ad01d232c1c25f
  Author: David Hampton <mythtv at love2code.net>
  Date:   2022-12-29 (Thu, 29 Dec 2022)

  Changed paths:
    M mythtv/libs/libmythfreesurround/el_processor.cpp
    M mythtv/libs/libmythfreesurround/freesurround.cpp

  Log Message:
  -----------
  Fix double promotion warnings in libmythfreesurround.

1) Explicitly mark constants as float (i.e. 0.5F).
2) Convert sqr() function to a template.
3) Add one static cast.


Compare: https://github.com/MythTV/mythtv/compare/a23b0d2afc9a...bcb4bd5db98c