Skip to content

Dependency Update Meta PR #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Dependency Update Meta PR #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/shared/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <fileapi.h>
#include <DbgHelp.h>

#define BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI 1
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/any.hpp>
Expand All @@ -56,9 +57,9 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/format.hpp>
#include <boost/interprocess/containers/map.hpp>
#include <boost/interprocess/containers/string.hpp>
#include <boost/interprocess/containers/vector.hpp>
#include <boost/container/map.hpp>
#include <boost/container/string.hpp>
#include <boost/container/vector.hpp>
#include <boost/interprocess/ipc/message_queue.hpp>
#include <boost/interprocess/managed_windows_shared_memory.hpp>
#include <boost/interprocess/offset_ptr.hpp>
Expand Down
3 changes: 2 additions & 1 deletion src/shared/shared_memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ along with usvfs. If not, see <http://www.gnu.org/licenses/>.
#pragma once

namespace bi = boost::interprocess;
namespace bc = boost::container;

namespace usvfs::shared
{
Expand All @@ -46,6 +47,6 @@ using SegmentManagerT = SharedMemoryT::segment_manager;
using VoidAllocatorT = boost::container::scoped_allocator_adaptor<boost::interprocess::allocator<void, SegmentManagerT>>;
using CharAllocatorT = VoidAllocatorT::rebind<char>::other;

using StringT = bi::basic_string<char, std::char_traits<char>, CharAllocatorT> ;
using StringT = bc::basic_string<char, std::char_traits<char>, CharAllocatorT> ;

} // namespace
2 changes: 1 addition & 1 deletion vsbuild/external_dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="external_dependencies_local.props" Condition="Exists('external_dependencies_local.props')"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<BOOST_PATH Condition="'$(BOOST_PATH)'==''">..\..\boost_1_85_0</BOOST_PATH>
<BOOST_PATH Condition="'$(BOOST_PATH)'==''">..\..\boost_1_88_0</BOOST_PATH>
<BOOST_PATH Condition="'$(BOOST_PATH)'!=''">$(BOOST_PATH)</BOOST_PATH>
<GTEST_PATH Condition="'$(GTEST_PATH)'==''">..\..\googletest</GTEST_PATH>
</PropertyGroup>
Expand Down