diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-20 14:27:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 14:27:25 +0000 |
| commit | b5a3ef3cc6b73813e85e0bb4c7afcdbb6c8ee220 (patch) | |
| tree | 9aba6987fa54dbbe5cd999a2a8885af8f709526c | |
| parent | 1758636b13a7a16df9ad900a0990ed844683c7ee (diff) | |
| parent | 1b2af79e85705da5bce8e737bce9d0890d489853 (diff) | |
| download | libgit2-b5a3ef3cc6b73813e85e0bb4c7afcdbb6c8ee220.tar.gz | |
Merge pull request #4944 from libgit2/ethomson/deprecation
Improve deprecation of old enums
| -rw-r--r-- | include/git2/common.h | 1 | ||||
| -rw-r--r-- | include/git2/refs.h | 16 | ||||
| -rw-r--r-- | include/git2/types.h | 22 |
3 files changed, 20 insertions, 19 deletions
diff --git a/include/git2/common.h b/include/git2/common.h index 8d3d3c111..70c02a48c 100644 --- a/include/git2/common.h +++ b/include/git2/common.h @@ -59,6 +59,7 @@ typedef size_t size_t; #if defined(__GNUC__) # define GIT_DEPRECATED(func) \ __attribute__((deprecated)) \ + __attribute__((used)) \ func #elif defined(_MSC_VER) # define GIT_DEPRECATED(func) __declspec(deprecated) func diff --git a/include/git2/refs.h b/include/git2/refs.h index 84d99382b..c11947b4a 100644 --- a/include/git2/refs.h +++ b/include/git2/refs.h @@ -762,18 +762,18 @@ GIT_EXTERN(const char *) git_reference_shorthand(const git_reference *ref); #define git_ref_t git_reference_t #define git_reference_normalize_t git_reference_format_t -GIT_DEPRECATED(static const unsigned int) GIT_REF_INVALID = GIT_REFERENCE_INVALID; -GIT_DEPRECATED(static const unsigned int) GIT_REF_OID = GIT_REFERENCE_DIRECT; -GIT_DEPRECATED(static const unsigned int) GIT_REF_SYMBOLIC = GIT_REFERENCE_SYMBOLIC; -GIT_DEPRECATED(static const unsigned int) GIT_REF_LISTALL = GIT_REFERENCE_ALL; +GIT_DEPRECATED(static const git_ref_t) GIT_REF_INVALID = GIT_REFERENCE_INVALID; +GIT_DEPRECATED(static const git_ref_t) GIT_REF_OID = GIT_REFERENCE_DIRECT; +GIT_DEPRECATED(static const git_ref_t) GIT_REF_SYMBOLIC = GIT_REFERENCE_SYMBOLIC; +GIT_DEPRECATED(static const git_ref_t) GIT_REF_LISTALL = GIT_REFERENCE_ALL; -GIT_DEPRECATED(static const unsigned int) GIT_REF_FORMAT_NORMAL = +GIT_DEPRECATED(static const git_reference_normalize_t) GIT_REF_FORMAT_NORMAL = GIT_REFERENCE_FORMAT_NORMAL; -GIT_DEPRECATED(static const unsigned int) GIT_REF_FORMAT_ALLOW_ONELEVEL = +GIT_DEPRECATED(static const git_reference_normalize_t) GIT_REF_FORMAT_ALLOW_ONELEVEL = GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL; -GIT_DEPRECATED(static const unsigned int) GIT_REF_FORMAT_REFSPEC_PATTERN = +GIT_DEPRECATED(static const git_reference_normalize_t) GIT_REF_FORMAT_REFSPEC_PATTERN = GIT_REFERENCE_FORMAT_REFSPEC_PATTERN; -GIT_DEPRECATED(static const unsigned int) GIT_REF_FORMAT_REFSPEC_SHORTHAND = +GIT_DEPRECATED(static const git_reference_normalize_t) GIT_REF_FORMAT_REFSPEC_SHORTHAND = GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND; /**@}*/ diff --git a/include/git2/types.h b/include/git2/types.h index fdecc3ab6..386958d7b 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -450,19 +450,19 @@ typedef struct git_mailmap git_mailmap; /**@{*/ -GIT_DEPRECATED(static const int) GIT_OBJ_ANY = GIT_OBJECT_ANY; -GIT_DEPRECATED(static const int) GIT_OBJ_BAD = GIT_OBJECT_INVALID; -GIT_DEPRECATED(static const int) GIT_OBJ__EXT1 = 0; -GIT_DEPRECATED(static const int) GIT_OBJ_COMMIT = GIT_OBJECT_COMMIT; -GIT_DEPRECATED(static const int) GIT_OBJ_TREE = GIT_OBJECT_TREE; -GIT_DEPRECATED(static const int) GIT_OBJ_BLOB = GIT_OBJECT_BLOB; -GIT_DEPRECATED(static const int) GIT_OBJ_TAG = GIT_OBJECT_TAG; -GIT_DEPRECATED(static const int) GIT_OBJ__EXT2 = 5; -GIT_DEPRECATED(static const int) GIT_OBJ_OFS_DELTA = GIT_OBJECT_OFS_DELTA; -GIT_DEPRECATED(static const int) GIT_OBJ_REF_DELTA = GIT_OBJECT_REF_DELTA; - #define git_otype git_object_t +GIT_DEPRECATED(static const git_otype) GIT_OBJ_ANY = GIT_OBJECT_ANY; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_BAD = GIT_OBJECT_INVALID; +GIT_DEPRECATED(static const git_otype) GIT_OBJ__EXT1 = 0; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_COMMIT = GIT_OBJECT_COMMIT; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_TREE = GIT_OBJECT_TREE; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_BLOB = GIT_OBJECT_BLOB; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_TAG = GIT_OBJECT_TAG; +GIT_DEPRECATED(static const git_otype) GIT_OBJ__EXT2 = 5; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_OFS_DELTA = GIT_OBJECT_OFS_DELTA; +GIT_DEPRECATED(static const git_otype) GIT_OBJ_REF_DELTA = GIT_OBJECT_REF_DELTA; + /**@}*/ /** @} */ |