Changeset e13c378 in mainline for uspace/lib/cpp/include/impl/memory.hpp

Timestamp:

2018-07-05T21:41:23Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5735b111

Parents:

537b300

git-author:

Dzejrou <dzejrou@…> (2018-05-09 20:15:58)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:23)

Message:

cpp: moved allocator arg outside of memory.hpp to avoid circular dependencies in shared_ptr

File:

• uspace/lib/cpp/include/impl/memory.hpp (modified) (3 diffs)

uspace/lib/cpp/include/impl/memory.hpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -31 +31 @@
 
 #include <internal/aux.hpp>
+#include <internal/memory/allocator_arg.hpp>
 #include <internal/memory/addressof.hpp>
 #include <iterator>
@@ -53 +54 @@
         using rebind = typename Ptr::template rebind<U>;
     };
-
-    /**
-     * 20.7.6, allocator argument tag:
-     */
-
-    struct allocator_arg_t
-    { /* DUMMY BODY */ };
-
-    constexpr allocator_arg_t allocator_arg{};
 
     /**