Changeset 7bbf91e in mainline for uspace/lib/cpp/include/__bits

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

2e53e83d

Parents:

fc15120

git-author:

Dzejrou <dzejrou@…> (2018-05-16 18:35:17)

git-committer:

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

Message:

cpp: changed internal to bits to avoid include space pollusion, fixed old std::hel:: bugs in files that weren't touched since

Location:

uspace/lib/cpp/include/__bits

Files:

• abi.hpp (moved) (moved from uspace/lib/cpp/include/internal/abi.hpp ) (1 diff)
• aux.hpp (moved) (moved from uspace/lib/cpp/include/internal/aux.hpp )
• builtins.hpp (moved) (moved from uspace/lib/cpp/include/internal/builtins.hpp ) (1 diff)
• common.hpp (moved) (moved from uspace/lib/cpp/include/internal/common.hpp ) (1 diff)
• functional/arithmetic_operations.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/arithmetic_operations.hpp ) (1 diff)
• functional/bind.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/bind.hpp ) (1 diff)
• functional/conditional_function_typedefs.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/conditional_function_typedefs.hpp ) (1 diff)
• functional/function.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/function.hpp ) (1 diff)
• functional/hash.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/hash.hpp ) (1 diff)
• functional/invoke.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/invoke.hpp ) (1 diff)
• functional/reference_wrapper.hpp (moved) (moved from uspace/lib/cpp/include/internal/functional/reference_wrapper.hpp ) (1 diff)
• hash_table.hpp (moved) (moved from uspace/lib/cpp/include/internal/hash_table.hpp ) (1 diff)
• hash_table_bucket.hpp (moved) (moved from uspace/lib/cpp/include/internal/hash_table_bucket.hpp ) (1 diff)
• hash_table_iterators.hpp (moved) (moved from uspace/lib/cpp/include/internal/hash_table_iterators.hpp ) (1 diff)
• hash_table_policies.hpp (moved) (moved from uspace/lib/cpp/include/internal/hash_table_policies.hpp ) (1 diff)
• insert_iterator.hpp (moved) (moved from uspace/lib/cpp/include/internal/insert_iterator.hpp ) (1 diff)
• iomanip.hpp (moved) (moved from uspace/lib/cpp/include/internal/iomanip.hpp ) (1 diff)
• iterator.hpp (moved) (moved from uspace/lib/cpp/include/internal/iterator.hpp ) (1 diff)
• key_extractors.hpp (moved) (moved from uspace/lib/cpp/include/internal/key_extractors.hpp ) (1 diff)
• list.hpp (moved) (moved from uspace/lib/cpp/include/internal/list.hpp ) (1 diff)
• locale.hpp (moved) (moved from uspace/lib/cpp/include/internal/locale.hpp ) (1 diff)
• locale/codecvt.hpp (moved) (moved from uspace/lib/cpp/include/internal/locale/codecvt.hpp ) (1 diff)
• locale/ctype.hpp (moved) (moved from uspace/lib/cpp/include/internal/locale/ctype.hpp ) (1 diff)
• locale/num_get.hpp (moved) (moved from uspace/lib/cpp/include/internal/locale/num_get.hpp ) (1 diff)
• locale/num_put.hpp (moved) (moved from uspace/lib/cpp/include/internal/locale/num_put.hpp ) (1 diff)
• locale/numpunct.hpp (moved) (moved from uspace/lib/cpp/include/internal/locale/numpunct.hpp ) (1 diff)
• memory/addressof.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/addressof.hpp ) (1 diff)
• memory/allocator_arg.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/allocator_arg.hpp ) (1 diff)
• memory/allocator_traits.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/allocator_traits.hpp ) (1 diff)
• memory/misc.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/misc.hpp ) (1 diff)
• memory/owner_less.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/owner_less.hpp ) (1 diff)
• memory/pointer_traits.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/pointer_traits.hpp ) (1 diff)
• memory/shared_payload.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/shared_payload.hpp ) (1 diff)
• memory/shared_ptr.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/shared_ptr.hpp ) (1 diff)
• memory/type_getters.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/type_getters.hpp ) (2 diffs)
• memory/unique_ptr.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/unique_ptr.hpp ) (1 diff)
• memory/weak_ptr.hpp (moved) (moved from uspace/lib/cpp/include/internal/memory/weak_ptr.hpp ) (1 diff)
• rbtree.hpp (moved) (moved from uspace/lib/cpp/include/internal/rbtree.hpp ) (1 diff)
• rbtree_iterators.hpp (moved) (moved from uspace/lib/cpp/include/internal/rbtree_iterators.hpp ) (1 diff)
• rbtree_node.hpp (moved) (moved from uspace/lib/cpp/include/internal/rbtree_node.hpp ) (1 diff)
• rbtree_policies.hpp (moved) (moved from uspace/lib/cpp/include/internal/rbtree_policies.hpp ) (1 diff)
• result_of.hpp (moved) (moved from uspace/lib/cpp/include/internal/result_of.hpp ) (1 diff)
• streambufs.hpp (moved) (moved from uspace/lib/cpp/include/internal/streambufs.hpp )
• string.hpp (moved) (moved from uspace/lib/cpp/include/internal/string.hpp ) (1 diff)
• stringfwd.hpp (moved) (moved from uspace/lib/cpp/include/internal/stringfwd.hpp ) (1 diff)
• test/mock.hpp (moved) (moved from uspace/lib/cpp/include/internal/test/mock.hpp ) (1 diff)
• test/test.hpp (moved) (moved from uspace/lib/cpp/include/internal/test/test.hpp )
• test/tests.hpp (moved) (moved from uspace/lib/cpp/include/internal/test/tests.hpp ) (1 diff)
• thread.hpp (moved) (moved from uspace/lib/cpp/include/internal/thread.hpp ) (1 diff)
• trycatch.hpp (moved) (moved from uspace/lib/cpp/include/internal/trycatch.hpp ) (2 diffs)
• tuple/tuple_cat.hpp (moved) (moved from uspace/lib/cpp/include/internal/tuple/tuple_cat.hpp ) (1 diff)
• tuple/tuple_ops.hpp (moved) (moved from uspace/lib/cpp/include/internal/tuple/tuple_ops.hpp ) (1 diff)
• type_traits/references.hpp (moved) (moved from uspace/lib/cpp/include/internal/type_traits/references.hpp ) (1 diff)
• type_traits/result_of.hpp (moved) (moved from uspace/lib/cpp/include/internal/type_traits/result_of.hpp ) (1 diff)
• type_transformation.hpp (moved) (moved from uspace/lib/cpp/include/internal/type_transformation.hpp ) (1 diff)
• utility/declval.hpp (moved) (moved from uspace/lib/cpp/include/internal/utility/declval.hpp ) (1 diff)
• utility/forward_move.hpp (moved) (moved from uspace/lib/cpp/include/internal/utility/forward_move.hpp ) (1 diff)

uspace/lib/cpp/include/__bits/abi.hpp

@@ -27 +27 @@
  */
 
+#include <cstddef>
 #include <cstdint>
 #include <typeinfo>

uspace/lib/cpp/include/__bits/builtins.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_BUILTINS
-#define LIBCPP_INTERNAL_BUILTINS
+#ifndef LIBCPP_BITS_BUILTINS
+#define LIBCPP_BITS_BUILTINS
 
 /**

uspace/lib/cpp/include/__bits/common.hpp

@@ -1 @@
-#ifndef LIBCPP_INTERNAL_COMMON
-#define LIBCPP_INTERNAL_COMMON
+#ifndef LIBCPP_BITS_COMMON
+#define LIBCPP_BITS_COMMON
 
 /**

uspace/lib/cpp/include/__bits/functional/arithmetic_operations.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTIONAL_ARITHMETIC_OPERATIONS
-#define LIBCPP_INTERNAL_FUNCTIONAL_ARITHMETIC_OPERATIONS
-
-#include <internal/utility/forward_move.hpp>
+#ifndef LIBCPP_BITS_FUNCTIONAL_ARITHMETIC_OPERATIONS
+#define LIBCPP_BITS_FUNCTIONAL_ARITHMETIC_OPERATIONS
+
+#include <__bits/utility/forward_move.hpp>
 #include <type_traits>
 

uspace/lib/cpp/include/__bits/functional/bind.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTIONAL_BIND
-#define LIBCPP_INTERNAL_FUNCTIONAL_BIND
-
-#include <internal/functional/function.hpp>
-#include <internal/functional/invoke.hpp>
-#include <internal/functional/reference_wrapper.hpp>
+#ifndef LIBCPP_BITS_FUNCTIONAL_BIND
+#define LIBCPP_BITS_FUNCTIONAL_BIND
+
+#include <__bits/functional/function.hpp>
+#include <__bits/functional/invoke.hpp>
+#include <__bits/functional/reference_wrapper.hpp>
 #include <tuple>
 #include <type_traits>

uspace/lib/cpp/include/__bits/functional/conditional_function_typedefs.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTION_CONDITIONAL_FUNCTION_TYPEDEFS
-#define LIBCPP_INTERNAL_FUNCTION_CONDITIONAL_FUNCTION_TYPEDEFS
+#ifndef LIBCPP_BITS_FUNCTION_CONDITIONAL_FUNCTION_TYPEDEFS
+#define LIBCPP_BITS_FUNCTION_CONDITIONAL_FUNCTION_TYPEDEFS
 
 namespace std::aux

uspace/lib/cpp/include/__bits/functional/function.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTIONAL_FUNCTION
-#define LIBCPP_INTERNAL_FUNCTIONAL_FUNCTION
-
-#include <internal/functional/conditional_function_typedefs.hpp>
-#include <internal/functional/reference_wrapper.hpp>
+#ifndef LIBCPP_BITS_FUNCTIONAL_FUNCTION
+#define LIBCPP_BITS_FUNCTIONAL_FUNCTION
+
+#include <__bits/functional/conditional_function_typedefs.hpp>
+#include <__bits/functional/reference_wrapper.hpp>
 #include <typeinfo>
 #include <type_traits>

uspace/lib/cpp/include/__bits/functional/hash.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTIONAL_HASH
-#define LIBCPP_INTERNAL_FUNCTIONAL_HASH
+#ifndef LIBCPP_BITS_FUNCTIONAL_HASH
+#define LIBCPP_BITS_FUNCTIONAL_HASH
 
 #include <cstdlib>

uspace/lib/cpp/include/__bits/functional/invoke.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTIONAL_INVOKE
-#define LIBCPP_INTERNAL_FUNCTIONAL_INVOKE
+#ifndef LIBCPP_BITS_FUNCTIONAL_INVOKE
+#define LIBCPP_BITS_FUNCTIONAL_INVOKE
 
-#include <internal/utility/declval.hpp>
-#include <internal/utility/forward_move.hpp>
+#include <__bits/utility/declval.hpp>
+#include <__bits/utility/forward_move.hpp>
 
 namespace std

uspace/lib/cpp/include/__bits/functional/reference_wrapper.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_FUNCTIONAL_REFERENCE_WRAPPER
-#define LIBCPP_INTERNAL_FUNCTIONAL_REFERENCE_WRAPPER
+#ifndef LIBCPP_BITS_FUNCTIONAL_REFERENCE_WRAPPER
+#define LIBCPP_BITS_FUNCTIONAL_REFERENCE_WRAPPER
 
-#include <internal/functional/conditional_function_typedefs.hpp>
-#include <internal/functional/invoke.hpp>
+#include <__bits/functional/conditional_function_typedefs.hpp>
+#include <__bits/functional/invoke.hpp>
 #include <type_traits>
 

uspace/lib/cpp/include/__bits/hash_table.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_HASH_TABLE
-#define LIBCPP_INTERNAL_HASH_TABLE
+#ifndef LIBCPP_BITS_HASH_TABLE
+#define LIBCPP_BITS_HASH_TABLE
 
 #include <cstdlib>
-#include <internal/list.hpp>
-#include <internal/key_extractors.hpp>
-#include <internal/hash_table_iterators.hpp>
-#include <internal/hash_table_policies.hpp>
+#include <__bits/list.hpp>
+#include <__bits/key_extractors.hpp>
+#include <__bits/hash_table_iterators.hpp>
+#include <__bits/hash_table_policies.hpp>
 #include <iterator>
 #include <limits>

uspace/lib/cpp/include/__bits/hash_table_bucket.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_HASH_TABLE_BUCKET
-#define LIBCPP_INTERNAL_HASH_TABLE_BUCKET
+#ifndef LIBCPP_BITS_HASH_TABLE_BUCKET
+#define LIBCPP_BITS_HASH_TABLE_BUCKET
 
-#include <internal/list.hpp>
+#include <__bits/list.hpp>
 
 namespace std::aux

uspace/lib/cpp/include/__bits/hash_table_iterators.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_HASH_TABLE_ITERATORS
-#define LIBCPP_INTERNAL_HASH_TABLE_ITERATORS
-
-#include <internal/iterator.hpp>
-#include <internal/list.hpp>
-#include <internal/hash_table_bucket.hpp>
+#ifndef LIBCPP_BITS_HASH_TABLE_ITERATORS
+#define LIBCPP_BITS_HASH_TABLE_ITERATORS
+
+#include <__bits/iterator.hpp>
+#include <__bits/list.hpp>
+#include <__bits/hash_table_bucket.hpp>
 #include <iterator>
 

uspace/lib/cpp/include/__bits/hash_table_policies.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_HASH_TABLE_POLICIES
-#define LIBCPP_INTERNAL_HASH_TABLE_POLICIES
+#ifndef LIBCPP_BITS_HASH_TABLE_POLICIES
+#define LIBCPP_BITS_HASH_TABLE_POLICIES
 
 #include <tuple>

uspace/lib/cpp/include/__bits/insert_iterator.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_INSERT_ITERATOR
-#define LIBCPP_INTERNAL_INSERT_ITERATOR
+#ifndef LIBCPP_BITS_INSERT_ITERATOR
+#define LIBCPP_BITS_INSERT_ITERATOR
 
 namespace std

uspace/lib/cpp/include/__bits/iomanip.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_IOMANIP
-#define LIBCPP_INTERNAL_IOMANIP
+#ifndef LIBCPP_BITS_IOMANIP
+#define LIBCPP_BITS_IOMANIP
 
 #include <ios>

uspace/lib/cpp/include/__bits/iterator.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_ITERATOR
-#define LIBCPP_INTERNAL_ITERATOR
+#ifndef LIBCPP_BITS_ITERATOR
+#define LIBCPP_BITS_ITERATOR
 
-#include <internal/aux.hpp>
+#include <__bits/aux.hpp>
 
 namespace std::aux

uspace/lib/cpp/include/__bits/key_extractors.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_KEY_EXTRACTORS
-#define LIBCPP_INTERNAL_KEY_EXTRACTORS
+#ifndef LIBCPP_BITS_KEY_EXTRACTORS
+#define LIBCPP_BITS_KEY_EXTRACTORS
 
 #include <utility>

uspace/lib/cpp/include/__bits/list.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LIST
-#define LIBCPP_INTERNAL_LIST
+#ifndef LIBCPP_BITS_LIST
+#define LIBCPP_BITS_LIST
 
 namespace std::aux

uspace/lib/cpp/include/__bits/locale.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LOCALE
-#define LIBCPP_INTERNAL_LOCALE
+#ifndef LIBCPP_BITS_LOCALE
+#define LIBCPP_BITS_LOCALE
 
 #include <impl/string.hpp>

uspace/lib/cpp/include/__bits/locale/codecvt.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LOCALE_CODECVT
-#define LIBCPP_INTERNAL_LOCALE_CODECVT
+#ifndef LIBCPP_BITS_LOCALE_CODECVT
+#define LIBCPP_BITS_LOCALE_CODECVT
 
 #include <intetnal/locale.hpp>

uspace/lib/cpp/include/__bits/locale/ctype.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LOCALE_CTYPE
-#define LIBCPP_INTERNAL_LOCALE_CTYPE
+#ifndef LIBCPP_BITS_LOCALE_CTYPE
+#define LIBCPP_BITS_LOCALE_CTYPE
 
 #include <cctype>
-#include <internal/locale.hpp>
+#include <__bits/locale.hpp>
 #include <impl/string.hpp>
 

uspace/lib/cpp/include/__bits/locale/num_get.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LOCALE_NUM_GET
-#define LIBCPP_INTERNAL_LOCALE_NUM_GET
+#ifndef LIBCPP_BITS_LOCALE_NUM_GET
+#define LIBCPP_BITS_LOCALE_NUM_GET
 
 #include <cerrno>
 #include <cstring>
-#include <internal/locale.hpp>
-#include <internal/locale/numpunct.hpp>
+#include <__bits/locale.hpp>
+#include <__bits/locale/numpunct.hpp>
 #include <ios>
 #include <iterator>

uspace/lib/cpp/include/__bits/locale/num_put.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LOCALE_NUM_PUT
-#define LIBCPP_INTERNAL_LOCALE_NUM_PUT
-
-#include <internal/locale.hpp>
-#include <internal/locale/numpunct.hpp>
+#ifndef LIBCPP_BITS_LOCALE_NUM_PUT
+#define LIBCPP_BITS_LOCALE_NUM_PUT
+
+#include <__bits/locale.hpp>
+#include <__bits/locale/numpunct.hpp>
 #include <ios>
 #include <iterator>

uspace/lib/cpp/include/__bits/locale/numpunct.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_LOCALE_NUMPUNCT
-#define LIBCPP_INTERNAL_LOCALE_NUMPUNCT
-
-#include <internal/locale.hpp>
+#ifndef LIBCPP_BITS_LOCALE_NUMPUNCT
+#define LIBCPP_BITS_LOCALE_NUMPUNCT
+
+#include <__bits/locale.hpp>
 #include <string>
 

uspace/lib/cpp/include/__bits/memory/addressof.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_ADDRESSOF
-#define LIBCPP_INTERNAL_MEMORY_ADDRESSOF
+#ifndef LIBCPP_BITS_MEMORY_ADDRESSOF
+#define LIBCPP_BITS_MEMORY_ADDRESSOF
 
 namespace std

uspace/lib/cpp/include/__bits/memory/allocator_arg.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_ALLOCATOR_ARG
-#define LIBCPP_INTERNAL_MEMORY_ALLOCATOR_ARG
+#ifndef LIBCPP_BITS_MEMORY_ALLOCATOR_ARG
+#define LIBCPP_BITS_MEMORY_ALLOCATOR_ARG
 
 namespace std

uspace/lib/cpp/include/__bits/memory/allocator_traits.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_ALLOCATOR_TRAITS
-#define LIBCPP_INTERNAL_MEMORY_ALLOCATOR_TRAITS
+#ifndef LIBCPP_BITS_MEMORY_ALLOCATOR_TRAITS
+#define LIBCPP_BITS_MEMORY_ALLOCATOR_TRAITS
 
 #include <cstddef>
-#include <internal/aux.hpp>
-#include <internal/memory/addressof.hpp>
-#include <internal/memory/pointer_traits.hpp>
-#include <internal/memory/type_getters.hpp>
+#include <__bits/aux.hpp>
+#include <__bits/memory/addressof.hpp>
+#include <__bits/memory/pointer_traits.hpp>
+#include <__bits/memory/type_getters.hpp>
 #include <limits>
 #include <type_traits>

uspace/lib/cpp/include/__bits/memory/misc.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_MISC
-#define LIBCPP_INTERNAL_MEMORY_MISC
+#ifndef LIBCPP_BITS_MEMORY_MISC
+#define LIBCPP_BITS_MEMORY_MISC
 
 #include <cstdlib>

uspace/lib/cpp/include/__bits/memory/owner_less.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_OWNER_LESS
-#define LIBCPP_INTERNAL_MEMORY_OWNER_LESS
+#ifndef LIBCPP_BITS_MEMORY_OWNER_LESS
+#define LIBCPP_BITS_MEMORY_OWNER_LESS
 
-#include <internal/memory/shared_ptr.hpp>
-#include <internal/memory/weak_ptr.hpp>
+#include <__bits/memory/shared_ptr.hpp>
+#include <__bits/memory/weak_ptr.hpp>
 
 namespace std

uspace/lib/cpp/include/__bits/memory/pointer_traits.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_POINTER_TRAITS
-#define LIBCPP_INTERNAL_MEMORY_POINTER_TRAITS
+#ifndef LIBCPP_BITS_MEMORY_POINTER_TRAITS
+#define LIBCPP_BITS_MEMORY_POINTER_TRAITS
 
 #include <cstddef>
-#include <internal/memory/addressof.hpp>
-#include <internal/memory/type_getters.hpp>
+#include <__bits/memory/addressof.hpp>
+#include <__bits/memory/type_getters.hpp>
 #include <type_traits>
 

uspace/lib/cpp/include/__bits/memory/shared_payload.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_SHARED_PAYLOAD
-#define LIBCPP_INTERNAL_MEMORY_SHARED_PAYLOAD
+#ifndef LIBCPP_BITS_MEMORY_SHARED_PAYLOAD
+#define LIBCPP_BITS_MEMORY_SHARED_PAYLOAD
 
 #include <cinttypes>

uspace/lib/cpp/include/__bits/memory/shared_ptr.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_SHARED_PTR
-#define LIBCPP_INTERNAL_MEMORY_SHARED_PTR
+#ifndef LIBCPP_BITS_MEMORY_SHARED_PTR
+#define LIBCPP_BITS_MEMORY_SHARED_PTR
 
 #include <exception>
-#include <internal/functional/arithmetic_operations.hpp>
-#include <internal/functional/hash.hpp>
-#include <internal/memory/allocator_arg.hpp>
-#include <internal/memory/shared_payload.hpp>
-#include <internal/memory/unique_ptr.hpp>
-#include <internal/trycatch.hpp>
+#include <__bits/functional/arithmetic_operations.hpp>
+#include <__bits/functional/hash.hpp>
+#include <__bits/memory/allocator_arg.hpp>
+#include <__bits/memory/shared_payload.hpp>
+#include <__bits/memory/unique_ptr.hpp>
+#include <__bits/trycatch.hpp>
 #include <type_traits>
 

uspace/lib/cpp/include/__bits/memory/type_getters.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_TYPE_GETTERS
-#define LIBCPP_INTERNAL_MEMORY_TYPE_GETTERS
+#ifndef LIBCPP_BITS_MEMORY_TYPE_GETTERS
+#define LIBCPP_BITS_MEMORY_TYPE_GETTERS
 
 /**
@@ -40 +40 @@
 
 #include <cstddef>
-#include <internal/aux.hpp>
+#include <__bits/aux.hpp>
 #include <type_traits>
 

uspace/lib/cpp/include/__bits/memory/unique_ptr.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_UNIQUE_PTR
-#define LIBCPP_INTERNAL_MEMORY_UNIQUE_PTR
-
-#include <internal/aux.hpp>
-#include <internal/functional/hash.hpp>
+#ifndef LIBCPP_BITS_MEMORY_UNIQUE_PTR
+#define LIBCPP_BITS_MEMORY_UNIQUE_PTR
+
+#include <__bits/aux.hpp>
+#include <__bits/functional/hash.hpp>
 #include <type_traits>
 #include <utility>

uspace/lib/cpp/include/__bits/memory/weak_ptr.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_MEMORY_WEAK_PTR
-#define LIBCPP_INTERNAL_MEMORY_WEAK_PTR
-
-#include <internal/memory/shared_payload.hpp>
+#ifndef LIBCPP_BITS_MEMORY_WEAK_PTR
+#define LIBCPP_BITS_MEMORY_WEAK_PTR
+
+#include <__bits/memory/shared_payload.hpp>
 #include <type_traits>
 #include <utility>

uspace/lib/cpp/include/__bits/rbtree.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_RBTREE
-#define LIBCPP_INTERNAL_RBTREE
-
-#include <internal/key_extractors.hpp>
-#include <internal/rbtree_iterators.hpp>
-#include <internal/rbtree_node.hpp>
-#include <internal/rbtree_policies.hpp>
+#ifndef LIBCPP_BITS_RBTREE
+#define LIBCPP_BITS_RBTREE
+
+#include <__bits/key_extractors.hpp>
+#include <__bits/rbtree_iterators.hpp>
+#include <__bits/rbtree_node.hpp>
+#include <__bits/rbtree_policies.hpp>
 
 namespace std::aux

uspace/lib/cpp/include/__bits/rbtree_iterators.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_RBTREE_ITERATORS
-#define LIBCPP_INTERNAL_RBTREE_ITERATORS
-
-#include <internal/iterator.hpp>
-#include <internal/rbtree_node.hpp>
+#ifndef LIBCPP_BITS_RBTREE_ITERATORS
+#define LIBCPP_BITS_RBTREE_ITERATORS
+
+#include <__bits/iterator.hpp>
+#include <__bits/rbtree_node.hpp>
 #include <iterator>
 

uspace/lib/cpp/include/__bits/rbtree_node.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_RBTREE_NODE
-#define LIBCPP_INTERNAL_RBTREE_NODE
+#ifndef LIBCPP_BITS_RBTREE_NODE
+#define LIBCPP_BITS_RBTREE_NODE
 
 #include <cassert>

uspace/lib/cpp/include/__bits/rbtree_policies.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_RBTREE_POLICIES
-#define LIBCPP_INTERNAL_RBTREE_POLICIES
-
-#include <internal/rbtree_node.hpp>
+#ifndef LIBCPP_BITS_RBTREE_POLICIES
+#define LIBCPP_BITS_RBTREE_POLICIES
+
+#include <__bits/rbtree_node.hpp>
 #include <utility>
 

uspace/lib/cpp/include/__bits/result_of.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_RESULT_OF
-#define LIBCPP_INTERNAL_RESULT_OF
+#ifndef LIBCPP_BITS_RESULT_OF
+#define LIBCPP_BITS_RESULT_OF
 
-#include <internal/invoke.hpp>
+#include <__bits/invoke.hpp>
 
 namespace std

uspace/lib/cpp/include/__bits/string.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_STRING
-#define LIBCPP_INTERNAL_STRING
+#ifndef LIBCPP_BITS_STRING
+#define LIBCPP_BITS_STRING
 
 #include <ios>

uspace/lib/cpp/include/__bits/stringfwd.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_STRINGFWD
-#define LIBCPP_INTERNAL_STRINGFWD
+#ifndef LIBCPP_BITS_STRINGFWD
+#define LIBCPP_BITS_STRINGFWD
 
 namespace std

uspace/lib/cpp/include/__bits/test/mock.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TEST_MOCK
-#define LIBCPP_INTERNAL_TEST_MOCK
+#ifndef LIBCPP_BITS_TEST_MOCK
+#define LIBCPP_BITS_TEST_MOCK
 
 #include <cstdlib>

uspace/lib/cpp/include/__bits/test/tests.hpp

@@ -31 +31 @@
 
 #include <cstdio>
-#include <internal/test/test.hpp>
+#include <__bits/test/test.hpp>
 #include <vector>
 

uspace/lib/cpp/include/__bits/thread.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_THREAD
-#define LIBCPP_INTERNAL_THREAD
+#ifndef LIBCPP_BITS_THREAD
+#define LIBCPP_BITS_THREAD
 
 namespace std::hel

uspace/lib/cpp/include/__bits/trycatch.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TRYCATCH
-#define LIBCPP_INTERNAL_TRYCATCH
+#ifndef LIBCPP_BITS_TRYCATCH
+#define LIBCPP_BITS_TRYCATCH
 
 // TODO: This header should be included in every libcpp header.
@@ -45 +45 @@
 #if LIBCPP_EXCEPTIONS_SUPPORTED == 0
 
+/**
+ * In case the file where our macros get expanded
+ * does not include cstdlib.
+ */
+extern "C" void abort(void) __attribute__((noreturn));
+extern "C" int printf(const char*, ...);
+
 namespace std
 {
-    /**
-     * In case the file where our macros get expanded
-     * does not include cstdlib.
-     */
-    extern "C" void abort(void) __attribute__((noreturn));
-    extern "C" int printf(const char*, ...);
-
     namespace aux
     {

uspace/lib/cpp/include/__bits/tuple/tuple_cat.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TUPLE_TUPLE_CAT
-#define LIBCPP_INTERNAL_TUPLE_TUPLE_CAT
+#ifndef LIBCPP_BITS_TUPLE_TUPLE_CAT
+#define LIBCPP_BITS_TUPLE_TUPLE_CAT
 
 #include <utility>

uspace/lib/cpp/include/__bits/tuple/tuple_ops.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TUPLE_TUPLE_OPS
-#define LIBCPP_INTERNAL_TUPLE_TUPLE_OPS
+#ifndef LIBCPP_BITS_TUPLE_TUPLE_OPS
+#define LIBCPP_BITS_TUPLE_TUPLE_OPS
 
 #include <utility>

uspace/lib/cpp/include/__bits/type_traits/references.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TYPE_TRAITS_REFERENCES
-#define LIBCPP_INTERNAL_TYPE_TRAITS_REFERENCES
+#ifndef LIBCPP_BITS_TYPE_TRAITS_REFERENCES
+#define LIBCPP_BITS_TYPE_TRAITS_REFERENCES
 
-#include <internal/aux.hpp>
+#include <__bits/aux.hpp>
 
 namespace std

uspace/lib/cpp/include/__bits/type_traits/result_of.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TYPE_TRAITS_RESULT_OF
-#define LIBCPP_INTERNAL_TYPE_TRAITS_RESULT_OF
+#ifndef LIBCPP_BITS_TYPE_TRAITS_RESULT_OF
+#define LIBCPP_BITS_TYPE_TRAITS_RESULT_OF
 
-#include <internal/functional/invoke.hpp>
+#include <__bits/functional/invoke.hpp>
 
 namespace std

uspace/lib/cpp/include/__bits/type_transformation.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_TYPE_TRANSFORMATION
-#define LIBCPP_INTERNAL_TYPE_TRANSFORMATION
+#ifndef LIBCPP_BITS_TYPE_TRANSFORMATION
+#define LIBCPP_BITS_TYPE_TRANSFORMATION
 
-#include <internal/aux.hpp>
+#include <__bits/aux.hpp>
 #include <type_traits>
 

uspace/lib/cpp/include/__bits/utility/declval.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_UTILITY_DECLVAL
-#define LIBCPP_INTERNAL_UTILITY_DECLVAL
+#ifndef LIBCPP_BITS_UTILITY_DECLVAL
+#define LIBCPP_BITS_UTILITY_DECLVAL
 
-#include <internal/type_traits/references.hpp>
+#include <__bits/type_traits/references.hpp>
 
 namespace std

uspace/lib/cpp/include/__bits/utility/forward_move.hpp

@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_INTERNAL_UTILITY_FORWARD_MOVE
-#define LIBCPP_INTERNAL_UTILITY_FORWARD_MOVE
+#ifndef LIBCPP_BITS_UTILITY_FORWARD_MOVE
+#define LIBCPP_BITS_UTILITY_FORWARD_MOVE
 
-#include <internal/type_traits/references.hpp>
+#include <__bits/type_traits/references.hpp>
 
 namespace std