[wesnoth-commits] [wesnoth/wesnoth] af9165: Fix the build

[Steve Cotton]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: af91654e26c7f1b14ff558b7f34822c80bd36fc5
      https://github.com/wesnoth/wesnoth/commit/af91654e26c7f1b14ff558b7f34822c80bd36fc5
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-09-15 (Sun, 15 Sep 2019)

  Changed paths:
    M data/schema/units/types.cfg
    M src/units/unit.cpp

  Log Message:
  -----------
  Fix the build

Explicitly use t_str() to avoid an ambiguous construction from
7bee8ee1574e16ec27f8904e6808bc1515fe4a86, which made GCC9 error out because it
could alternatively use t_string::t_string(const string &).

Resolve the merge conflict from 26d1ca7a7d1216e8f19f2848f6556c456e9d1f3f