diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index fff5556..0915a56 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -27,6 +27,8 @@ jobs: - uses: actions/checkout@v1 - name: "build linux" run: | + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 --slave /usr/bin/g++ g++ /usr/bin/g++-14 --slave /usr/bin/gcov gcov /usr/bin/gcov-14 + sudo update-alternatives --set gcc /usr/bin/gcc-14 sudo apt-get update sudo apt-get install -y libglfw3-dev libsdl2-dev gcc-multilib g++-multilib libfreetype6-dev libvulkan-dev git submodule update --init --recursive diff --git a/symmetri/gui/load_file.cpp b/symmetri/gui/load_file.cpp index 77f3202..0ec8168 100644 --- a/symmetri/gui/load_file.cpp +++ b/symmetri/gui/load_file.cpp @@ -76,7 +76,8 @@ void loadPetriNet(const std::filesystem::path& file) { m.colors = symmetri::Token::getColors(); - append(std::move(new_net.priority), m.net.priority); + m.net.priority.insert(m.net.priority.end(), new_net.priority.begin(), + new_net.priority.end()); append(std::move(new_net.transition), m.net.transition); append(std::move(new_net.place), m.net.place); append(std::move(new_net.output_n), m.net.output_n);