Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
igaztanaga committed Sep 13, 2024
2 parents 342f3cc + 8a348c8 commit 09f5aa6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions include/boost/interprocess/detail/named_proxy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ template
>
class named_proxy
{
typedef T object_type;
typedef typename SegmentManager::char_type char_type;
const char_type * mp_name;
SegmentManager * mp_mngr;
Expand Down

0 comments on commit 09f5aa6

Please sign in to comment.