Browse Source

Merge branch 'master' of github.com:cppit/jucipp into ci

merge-requests/365/head
Jørgen Lien Sellæg 10 years ago
parent
commit
639aad0652
  1. 10
      appveyor.yml
  2. 4
      src/filesystem.cc

10
appveyor.yml

@ -8,8 +8,8 @@ before_build:
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
build_script:
- C:\msys64\usr\bin\bash -lc "script=compile CXX=clang++ CC=clang $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=clean $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=static_analysis $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile make_command=\"broadwayd & make test\" $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile CXX=clang++ CC=clang C:\projects\jucipp\ci\execute.sh"
- C:\msys64\usr\bin\bash -lc "script=clean C:\projects\jucipp\ci\execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile C:\projects\jucipp\ci\execute.sh"
- C:\msys64\usr\bin\bash -lc "script=static_analysis C:\projects\jucipp\ci\execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile make_command=\"broadwayd & make test\" C:\projects\jucipp\ci\execute.sh"

4
src/filesystem.cc

@ -25,7 +25,7 @@ int filesystem::read(const std::string &path, Glib::RefPtr<Gtk::TextBuffer> text
//need to read the whole file to make this work...
std::stringstream ss;
ss << input.rdbuf();
Glib::ustring ustr=std::move(ss.str());
Glib::ustring ustr=ss.str();
bool valid=true;
@ -70,7 +70,7 @@ int filesystem::read_non_utf8(const std::string &path, Glib::RefPtr<Gtk::TextBuf
//need to read the whole file to make this work...
std::stringstream ss;
ss << input.rdbuf();
Glib::ustring ustr=std::move(ss.str());
Glib::ustring ustr=ss.str();
bool valid=true;
Glib::ustring::iterator iter;

Loading…
Cancel
Save