[Commits] [wesnoth/wesnoth] c27fb4: fix filesystem_boost.cpp on mingw

GitHub noreply at github.com
Thu Oct 23 21:59:43 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c27fb4d00e185fdf55848748d246bde884d7dd44
      https://github.com/wesnoth/wesnoth/commit/c27fb4d00e185fdf55848748d246bde884d7dd44
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M src/filesystem_boost.cpp

  Log Message:
  -----------
  fix filesystem_boost.cpp on mingw

this raises our dependency for boost iostream to 1.44 or above


  Commit: 66712590d0f5bfa6f37afe7441b4ecbd7cd0d433
      https://github.com/wesnoth/wesnoth/commit/66712590d0f5bfa6f37afe7441b4ecbd7cd0d433
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M src/filesystem_boost.cpp

  Log Message:
  -----------
  add boost 1.44 comability

it seems like iostream from boost 1.44 is incompatible to filesystem
from boost  1.44.
Actualy i didnt veryfy this becasue i don't have boost < 1.50. I added
an adapter for boost filesystem that made it looks liek filesystem 1.43
which we can pass to boost iostreams 1.44.


  Commit: 6ad7a525cfe0e9c6d027daf83e410925ef94bf1d
      https://github.com/wesnoth/wesnoth/commit/6ad7a525cfe0e9c6d027daf83e410925ef94bf1d
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M src/util.hpp

  Log Message:
  -----------
  fix msvc warning


  Commit: 360bef9b95a316da1284c50d6fc9a4d2e54b747a
      https://github.com/wesnoth/wesnoth/commit/360bef9b95a316da1284c50d6fc9a4d2e54b747a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/gui/auxiliary/event/handler.cpp
    A src/serialization/ucs4_convert_impl.hpp
    M src/serialization/unicode.cpp
    M src/serialization/unicode.hpp
    A src/serialization/unicode_cast.hpp
    A src/serialization/unicode_types.hpp

  Log Message:
  -----------
  make unicode_cast more generic

unicode_cast is now a template function that works with different types
of containers. Especialy it now works with both std::wstring and
vector<wchar_t>


  Commit: 7e2f0e6c37104b0032da87eef3e13cc1c964f4c6
      https://github.com/wesnoth/wesnoth/commit/7e2f0e6c37104b0032da87eef3e13cc1c964f4c6
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/game_preferences.cpp
    M src/gui/auxiliary/event/dispatcher.hpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/auxiliary/filter.hpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/widgets/password_box.cpp
    M src/gui/widgets/text.cpp
    M src/gui/widgets/text_box.cpp
    M src/marked-up_text.cpp
    M src/marked-up_text.hpp
    M src/race.cpp
    M src/race.hpp
    M src/text.cpp
    M src/text.hpp

  Log Message:
  -----------
  fix some includes


  Commit: 1faa268de5f2a3892ffae83e74078e21db644684
      https://github.com/wesnoth/wesnoth/commit/1faa268de5f2a3892ffae83e74078e21db644684
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/serialization/ucs4_iterator_base.hpp
    M src/serialization/unicode.cpp
    M src/serialization/unicode.hpp

  Log Message:
  -----------
  simplyfy utf8::iterator implementation


  Commit: cd1ab92d7402b6a5b6888f2d00370ec1d2d3c5f6
      https://github.com/wesnoth/wesnoth/commit/cd1ab92d7402b6a5b6888f2d00370ec1d2d3c5f6
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/serialization/ucs4_iterator_base.hpp
    M src/serialization/unicode.hpp

  Log Message:
  -----------
  remove double declarations in unicode.hpp


  Commit: 0586becbfa08a124cc17745c26390fd78f59c4bc
      https://github.com/wesnoth/wesnoth/commit/0586becbfa08a124cc17745c26390fd78f59c4bc
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/filesystem_boost.cpp

  Log Message:
  -----------
  add custom codecvt for better error mesages.

this codecvt gibes errormessages in LOG_FS if it meets an invalid utf8 char.
also the boost codecvt seems inconsistetn becasue it seems on msvc it acepts utf8 AND ansi while it only accpets ansi on mingw.


  Commit: fa67d145714625f5f4e75b6c1c0adbe7e4279944
      https://github.com/wesnoth/wesnoth/commit/fa67d145714625f5f4e75b6c1c0adbe7e4279944
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/tests/test_commandline_options.cpp
    M src/tests/test_mp_connect.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  use unicode programm args on windows


  Commit: 2ecf630ad363d555b445fe6b2229e15d732c20a5
      https://github.com/wesnoth/wesnoth/commit/2ecf630ad363d555b445fe6b2229e15d732c20a5
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/hotkey/hotkey_item.cpp
    M src/serialization/unicode_cast.hpp

  Log Message:
  -----------
  fix unicode cast


  Commit: 8a81fb526dcf84cbb3b4ecafc94ff07fe38bae73
      https://github.com/wesnoth/wesnoth/commit/8a81fb526dcf84cbb3b4ecafc94ff07fe38bae73
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/filesystem_boost.cpp
    M src/game_preferences.cpp
    M src/gui/auxiliary/event/dispatcher.hpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/auxiliary/filter.hpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/widgets/password_box.cpp
    M src/gui/widgets/text.cpp
    M src/gui/widgets/text_box.cpp
    M src/hotkey/hotkey_item.cpp
    M src/marked-up_text.cpp
    M src/marked-up_text.hpp
    M src/race.cpp
    M src/race.hpp
    A src/serialization/ucs4_convert_impl.hpp
    M src/serialization/ucs4_iterator_base.hpp
    M src/serialization/unicode.cpp
    M src/serialization/unicode.hpp
    A src/serialization/unicode_cast.hpp
    A src/serialization/unicode_types.hpp
    M src/tests/test_commandline_options.cpp
    M src/tests/test_mp_connect.cpp
    M src/text.cpp
    M src/text.hpp
    M src/util.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Merge pull request #305 from gfgtdf/istream_fix

we now use boost::istreams instead of boost::filesystem::fstream because the later doesnt work with mingw.
we now use a custom codecvt instead of boost locale because we want to get better error messages for invalid utf8 strings using our _ERR streams
we now use unicode prgamm commandline args on windows..


Compare: https://github.com/wesnoth/wesnoth/compare/635949f31368...8a81fb526dcf


More information about the Commits mailing list