Commit 452b7f8f4c665d4b2daa257f7f4cf9836c270085
2019-09-25T20:29:21
Don't use enum for flags Using an `enum` causes trouble when used with C++ as bitwise operations are not possible w/o casting (e.g., `opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY;` is invalid as there is no `&=` operator for `enum`). Signed-off-by: Sven Strickroth <email@cs-ware.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/include/git2/blob.h b/include/git2/blob.h
index 1dfd6b7..40f922b 100644
--- a/include/git2/blob.h
+++ b/include/git2/blob.h
@@ -122,8 +122,8 @@ typedef enum {
typedef struct {
int version;
- /** Flags to control the filtering process */
- git_blob_filter_flag_t flags;
+ /** Flags to control the filtering process, see `git_blob_filter_flag_t` above */
+ uint32_t flags;
} git_blob_filter_options;
#define GIT_BLOB_FILTER_OPTIONS_VERSION 1
diff --git a/include/git2/diff.h b/include/git2/diff.h
index c89c32f..73c5e55 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -1378,7 +1378,8 @@ typedef enum {
typedef struct {
unsigned int version;
- git_diff_format_email_flags_t flags;
+ /** see `git_diff_format_email_flags_t` above */
+ uint32_t flags;
/** This patch number */
size_t patch_no;
@@ -1435,7 +1436,7 @@ GIT_EXTERN(int) git_diff_commit_as_email(
git_commit *commit,
size_t patch_no,
size_t total_patches,
- git_diff_format_email_flags_t flags,
+ uint32_t flags,
const git_diff_options *diff_opts);
/**
diff --git a/include/git2/merge.h b/include/git2/merge.h
index d638009..fc27c9d 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -192,7 +192,7 @@ typedef struct {
git_merge_file_favor_t favor;
/** see `git_merge_file_flag_t` above */
- git_merge_file_flag_t flags;
+ uint32_t flags;
/** The size of conflict markers (eg, "<<<<<<<"). Default is
* GIT_MERGE_CONFLICT_MARKER_SIZE. */
@@ -247,7 +247,7 @@ typedef struct {
unsigned int version;
/** See `git_merge_flag_t` above */
- git_merge_flag_t flags;
+ uint32_t flags;
/**
* Similarity to consider a file renamed (default 50). If
@@ -291,7 +291,7 @@ typedef struct {
git_merge_file_favor_t file_favor;
/** see `git_merge_file_flag_t` above */
- git_merge_file_flag_t file_flags;
+ uint32_t file_flags;
} git_merge_options;
#define GIT_MERGE_OPTIONS_VERSION 1
diff --git a/include/git2/stash.h b/include/git2/stash.h
index bee26f1..22448cc 100644
--- a/include/git2/stash.h
+++ b/include/git2/stash.h
@@ -127,7 +127,7 @@ typedef struct git_stash_apply_options {
unsigned int version;
/** See `git_stash_apply_flags_t`, above. */
- git_stash_apply_flags flags;
+ uint32_t flags;
/** Options to use when writing files to the working directory. */
git_checkout_options checkout_options;
diff --git a/src/diff.c b/src/diff.c
index 3c6a0f2..15a32ed 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -323,7 +323,7 @@ int git_diff_commit_as_email(
git_commit *commit,
size_t patch_no,
size_t total_patches,
- git_diff_format_email_flags_t flags,
+ uint32_t flags,
const git_diff_options *diff_opts)
{
git_diff *diff = NULL;