mirror of
https://github.com/boostorg/interprocess.git
synced 2026-01-19 16:22:19 +00:00
Fixed merge conflict
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user