Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-09 03:57:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 39

Merge branch 'noboost_more_more_more' into 'master'

Browse source 
Remove some more of boost::

See merge request OpenMW/openmw!1930
This commit is contained in:
psi29a 2022-05-26 06:19:40 +00:00
commit 389e1bd92c
6 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -1,5 +1,7 @@
#include "statemanagerimp.hpp"
#include <filesystem>
#include <components/debug/debuglog.hpp>
#include <components/esm3/esmwriter.hpp>
@ -388,7 +390,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
{
cleanup();
Log(Debug::Info) << "Reading save file " << boost::filesystem::path(filepath).filename().string();
Log(Debug::Info) << "Reading save file " << std::filesystem::path(filepath).filename().string();
ESM::ESMReader reader;
reader.open (filepath);

7
apps/openmw_test_suite/mwworld/test_store.cpp
View file

@ -1,6 +1,7 @@
#include <gtest/gtest.h>
#include <boost/filesystem/fstream.hpp>
#include <fstream>
#include <filesystem>
#include <components/files/configurationmanager.hpp>
#include <components/esm3/esmreader.hpp>
@ -110,7 +111,7 @@ TEST_F(ContentFileTest, dialogue_merging_test)
const std::string file = "test_dialogue_merging.txt";
boost::filesystem::ofstream stream;
std::ofstream stream;
stream.open(file);
const MWWorld::Store<ESM::Dialogue>& dialStore = mEsmStore.get<ESM::Dialogue>();
@ -192,7 +193,7 @@ TEST_F(ContentFileTest, content_diagnostics_test)
const std::string file = "test_content_diagnostics.txt";
boost::filesystem::ofstream stream;
std::ofstream stream;
stream.open(file);
RUN_TEST_FOR_TYPES(printRecords, mEsmStore, stream);

4
apps/openmw_test_suite/settings/parser.cpp
View file

@ -1,6 +1,6 @@
#include <components/settings/parser.hpp>
#include <boost/filesystem/fstream.hpp>
#include <fstream>
#include <gtest/gtest.h>
@ -20,7 +20,7 @@ namespace
const auto path = std::string(UnitTest::GetInstance()->current_test_info()->name()) + ".cfg";
{
boost::filesystem::ofstream stream;
std::ofstream stream;
stream.open(path);
stream << content;
stream.close();

4
apps/openmw_test_suite/shader/shadermanager.cpp
View file

@ -1,6 +1,6 @@
#include <components/shader/shadermanager.hpp>
#include <boost/filesystem/fstream.hpp>
#include <fstream>
#include <gtest/gtest.h>
@ -31,7 +31,7 @@ namespace
const auto path = UnitTest::GetInstance()->current_test_info()->name() + suffix + ".glsl";
{
boost::filesystem::ofstream stream;
std::ofstream stream;
stream.open(path);
stream << content;
stream.close();