diff --git a/BUILD b/BUILD index e0945c4c31..4f8f43776d 100644 --- a/BUILD +++ b/BUILD @@ -208,7 +208,7 @@ cc_library( cc_library( name = "message_accessors_internal", hdrs = [ - "upb/message/accessors_internal.h", + "upb/message/internal/accessors.h", ], copts = UPB_DEFAULT_COPTS, visibility = ["//:friends"], @@ -224,7 +224,7 @@ cc_library( name = "message_accessors", srcs = [ "upb/message/accessors.c", - "upb/message/accessors_internal.h", + "upb/message/internal/accessors.h", ], hdrs = [ "upb/message/accessors.h", diff --git a/upb/generated_code_support.h b/upb/generated_code_support.h index 1c93b40f85..4f9d1341fb 100644 --- a/upb/generated_code_support.h +++ b/upb/generated_code_support.h @@ -34,9 +34,9 @@ #include "upb/collections/map_gencode_util.h" #include "upb/collections/message_value.h" #include "upb/message/accessors.h" -#include "upb/message/accessors_internal.h" #include "upb/message/extension_internal.h" #include "upb/message/internal.h" +#include "upb/message/internal/accessors.h" #include "upb/message/message.h" #include "upb/mini_descriptor/decode.h" #include "upb/mini_table/enum.h" diff --git a/upb/message/accessors.h b/upb/message/accessors.h index f037ba09be..2acc7730c6 100644 --- a/upb/message/accessors.h +++ b/upb/message/accessors.h @@ -33,8 +33,8 @@ #include "upb/collections/array_internal.h" #include "upb/collections/map.h" #include "upb/collections/map_internal.h" -#include "upb/message/accessors_internal.h" #include "upb/message/internal.h" +#include "upb/message/internal/accessors.h" #include "upb/mini_table/enum.h" #include "upb/mini_table/field.h" diff --git a/upb/message/accessors_internal.h b/upb/message/internal/accessors.h similarity index 99% rename from upb/message/accessors_internal.h rename to upb/message/internal/accessors.h index 15dd1cd24a..b2e411ce7c 100644 --- a/upb/message/accessors_internal.h +++ b/upb/message/internal/accessors.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef UPB_MESSAGE_ACCESSORS_INTERNAL_H_ -#define UPB_MESSAGE_ACCESSORS_INTERNAL_H_ +#ifndef UPB_MESSAGE_INTERNAL_ACCESSORS_H_ +#define UPB_MESSAGE_INTERNAL_ACCESSORS_H_ #include "upb/collections/map_internal.h" #include "upb/message/extension_internal.h" @@ -383,4 +383,4 @@ UPB_INLINE upb_Map* _upb_Message_GetOrCreateMutableMap( #include "upb/port/undef.inc" -#endif // UPB_MESSAGE_ACCESSORS_INTERNAL_H_ +#endif // UPB_MESSAGE_INTERNAL_ACCESSORS_H_ diff --git a/upb/mini_descriptor/internal/encode_test.cc b/upb/mini_descriptor/internal/encode_test.cc index 61127c5968..df1f6422ec 100644 --- a/upb/mini_descriptor/internal/encode_test.cc +++ b/upb/mini_descriptor/internal/encode_test.cc @@ -34,7 +34,7 @@ #include "gtest/gtest.h" #include "absl/container/flat_hash_set.h" #include "google/protobuf/descriptor.h" -#include "upb/message/accessors_internal.h" +#include "upb/message/internal/accessors.h" #include "upb/mini_descriptor/decode.h" #include "upb/mini_descriptor/internal/base92.h" #include "upb/mini_descriptor/internal/modifiers.h" diff --git a/upb/wire/decode.c b/upb/wire/decode.c index c7a116d43b..6a59545848 100644 --- a/upb/wire/decode.c +++ b/upb/wire/decode.c @@ -33,7 +33,7 @@ #include "upb/collections/array_internal.h" #include "upb/collections/map_internal.h" #include "upb/mem/internal/arena.h" -#include "upb/message/accessors_internal.h" +#include "upb/message/internal/accessors.h" #include "upb/message/internal/map_entry.h" #include "upb/mini_table/sub.h" #include "upb/port/atomic.h" diff --git a/upb/wire/encode.c b/upb/wire/encode.c index 522ef24fe2..50aaa8dc4a 100644 --- a/upb/wire/encode.c +++ b/upb/wire/encode.c @@ -33,8 +33,8 @@ #include "upb/collections/array_internal.h" #include "upb/collections/map_sorter_internal.h" -#include "upb/message/accessors_internal.h" #include "upb/message/extension_internal.h" +#include "upb/message/internal/accessors.h" #include "upb/mini_table/sub.h" #include "upb/wire/common.h" #include "upb/wire/internal/common.h"