aboutsummaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 10:59:23 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-14 13:10:05 -0800
commit6ca32f47145370b6c0d956d1f8568d7e0595f195 (patch)
tree6da62e2115f422c6df36b599aeb4607adb93616f /cache.h
parent5be1f00a9a701532232f57958efab4be8c959a29 (diff)
downloadgit-6ca32f47145370b6c0d956d1f8568d7e0595f195.tar.gz
object_info: change member name from 'typename' to 'type_name'
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index d8b975a571..69b5a3bf81 100644
--- a/cache.h
+++ b/cache.h
@@ -1744,7 +1744,7 @@ struct object_info {
unsigned long *sizep;
off_t *disk_sizep;
unsigned char *delta_base_sha1;
- struct strbuf *typename;
+ struct strbuf *type_name;
void **contentp;
/* Response */