diff options
| -rw-r--r-- | runtime/handle.cc | 2 | ||||
| -rw-r--r-- | runtime/handle.h | 2 | ||||
| -rw-r--r-- | runtime/handle_scope-inl.h | 2 | ||||
| -rw-r--r-- | runtime/handle_scope.h | 2 | ||||
| -rw-r--r-- | runtime/handle_scope_test.cc | 2 | ||||
| -rw-r--r-- | runtime/handle_wrapper.h | 3 | ||||
| -rw-r--r-- | runtime/hidden_api.cc | 2 | ||||
| -rw-r--r-- | runtime/hidden_api.h | 3 | ||||
| -rw-r--r-- | runtime/hidden_api_test.cc | 2 | ||||
| -rw-r--r-- | runtime/hprof/hprof.cc | 2 | ||||
| -rw-r--r-- | runtime/hprof/hprof.h | 4 |
11 files changed, 15 insertions, 11 deletions
diff --git a/runtime/handle.cc b/runtime/handle.cc index e9c91135f5..d1a00f35df 100644 --- a/runtime/handle.cc +++ b/runtime/handle.cc @@ -40,7 +40,7 @@ #include "class_root-inl.h" -namespace art { +namespace art HIDDEN { // NOLINTBEGIN(bugprone-macro-parentheses) #define MAKE_OBJECT_FOR_GDB(ROOT, NAME, MIRROR) \ diff --git a/runtime/handle.h b/runtime/handle.h index b34d983d6a..318f86375b 100644 --- a/runtime/handle.h +++ b/runtime/handle.h @@ -27,7 +27,7 @@ #include "obj_ptr.h" #include "stack_reference.h" -namespace art { +namespace art HIDDEN { class Thread; diff --git a/runtime/handle_scope-inl.h b/runtime/handle_scope-inl.h index e620e92e1f..48c61c231f 100644 --- a/runtime/handle_scope-inl.h +++ b/runtime/handle_scope-inl.h @@ -28,7 +28,7 @@ #include "thread-current-inl.h" #include "verify_object.h" -namespace art { +namespace art HIDDEN { template<size_t kNumReferences> inline FixedSizeHandleScope<kNumReferences>::FixedSizeHandleScope(BaseHandleScope* link) diff --git a/runtime/handle_scope.h b/runtime/handle_scope.h index 791023085a..dbfd7744a5 100644 --- a/runtime/handle_scope.h +++ b/runtime/handle_scope.h @@ -26,7 +26,7 @@ #include "base/macros.h" #include "stack_reference.h" -namespace art { +namespace art HIDDEN { template<class T> class Handle; class HandleScope; diff --git a/runtime/handle_scope_test.cc b/runtime/handle_scope_test.cc index 2e45bdae4a..3352c097c7 100644 --- a/runtime/handle_scope_test.cc +++ b/runtime/handle_scope_test.cc @@ -28,7 +28,7 @@ #include "scoped_thread_state_change-inl.h" #include "thread.h" -namespace art { +namespace art HIDDEN { // Handles are value objects and should be trivially copyable. static_assert(std::is_trivially_copyable<Handle<mirror::Object>>::value, diff --git a/runtime/handle_wrapper.h b/runtime/handle_wrapper.h index a0bb772765..29e74ce949 100644 --- a/runtime/handle_wrapper.h +++ b/runtime/handle_wrapper.h @@ -17,10 +17,11 @@ #ifndef ART_RUNTIME_HANDLE_WRAPPER_H_ #define ART_RUNTIME_HANDLE_WRAPPER_H_ +#include "base/macros.h" #include "handle.h" #include "obj_ptr.h" -namespace art { +namespace art HIDDEN { // A wrapper which wraps around Object** and restores the pointer in the destructor. // TODO: Delete diff --git a/runtime/hidden_api.cc b/runtime/hidden_api.cc index ae99d528c2..b6cca33c21 100644 --- a/runtime/hidden_api.cc +++ b/runtime/hidden_api.cc @@ -35,7 +35,7 @@ #include "thread-inl.h" #include "well_known_classes.h" -namespace art { +namespace art HIDDEN { namespace hiddenapi { // Should be the same as dalvik.system.VMRuntime.HIDE_MAXTARGETSDK_P_HIDDEN_APIS, diff --git a/runtime/hidden_api.h b/runtime/hidden_api.h index 1f6abf7c6a..4b97b0d552 100644 --- a/runtime/hidden_api.h +++ b/runtime/hidden_api.h @@ -22,6 +22,7 @@ #include "base/hiddenapi_domain.h" #include "base/hiddenapi_flags.h" #include "base/locks.h" +#include "base/macros.h" #include "dex/class_accessor.h" #include "intrinsics_enum.h" #include "jni/jni_internal.h" @@ -30,7 +31,7 @@ #include "reflection.h" #include "runtime.h" -namespace art { +namespace art HIDDEN { namespace hiddenapi { // Hidden API enforcement policy diff --git a/runtime/hidden_api_test.cc b/runtime/hidden_api_test.cc index 3fb447afc9..7dc3d901df 100644 --- a/runtime/hidden_api_test.cc +++ b/runtime/hidden_api_test.cc @@ -28,7 +28,7 @@ #include "proxy_test.h" #include "well_known_classes-inl.h" -namespace art { +namespace art HIDDEN { using android::base::StringPrintf; using hiddenapi::detail::MemberSignature; diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc index ea64cc13ce..9e1bc29d84 100644 --- a/runtime/hprof/hprof.cc +++ b/runtime/hprof/hprof.cc @@ -68,7 +68,7 @@ #include "scoped_thread_state_change-inl.h" #include "thread_list.h" -namespace art { +namespace art HIDDEN { namespace hprof { diff --git a/runtime/hprof/hprof.h b/runtime/hprof/hprof.h index 91684648a5..3d79d303b2 100644 --- a/runtime/hprof/hprof.h +++ b/runtime/hprof/hprof.h @@ -17,7 +17,9 @@ #ifndef ART_RUNTIME_HPROF_HPROF_H_ #define ART_RUNTIME_HPROF_HPROF_H_ -namespace art { +#include "base/macros.h" + +namespace art HIDDEN { namespace hprof { |