summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2023-02-04 21:55:18 -0500
committerDavid Robillard <d@drobilla.net>2023-02-04 21:55:18 -0500
commitf5d33a2cda7b6f498bb7e5e61e298dce5510ed5c (patch)
treee0fa2a8958e93a0194f22bb229c0d3c9d43d34a1
parent4113c78db9969054354b153819bde4ff0c8b6a73 (diff)
downloadsord-f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c.tar.gz
sord-f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c.tar.bz2
sord-f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c.zip
Fix clang and clang-tidy warnings on Windows
-rw-r--r--include/sord/sord.h26
-rw-r--r--meson/suppressions/meson.build7
2 files changed, 20 insertions, 13 deletions
diff --git a/include/sord/sord.h b/include/sord/sord.h
index 08ab46f..93f9c07 100644
--- a/include/sord/sord.h
+++ b/include/sord/sord.h
@@ -88,31 +88,31 @@ typedef const SordNode* SordQuad[4];
Index into a SordQuad.
*/
typedef enum {
- SORD_SUBJECT = 0, /**< Subject */
- SORD_PREDICATE = 1, /**< Predicate ("key") */
- SORD_OBJECT = 2, /**< Object ("value") */
- SORD_GRAPH = 3 /**< Graph ("context") */
+ SORD_SUBJECT = 0U, /**< Subject */
+ SORD_PREDICATE = 1U, /**< Predicate ("key") */
+ SORD_OBJECT = 2U, /**< Object ("value") */
+ SORD_GRAPH = 3U /**< Graph ("context") */
} SordQuadIndex;
/**
Type of a node.
*/
typedef enum {
- SORD_URI = 1, /**< URI */
- SORD_BLANK = 2, /**< Blank node identifier */
- SORD_LITERAL = 3 /**< Literal (string with optional lang or datatype) */
+ SORD_URI = 1U, /**< URI */
+ SORD_BLANK = 2U, /**< Blank node identifier */
+ SORD_LITERAL = 3U /**< Literal (string with optional lang or datatype) */
} SordNodeType;
/**
Indexing option.
*/
typedef enum {
- SORD_SPO = 1, /**< Subject, Predicate, Object */
- SORD_SOP = 1 << 1, /**< Subject, Object, Predicate */
- SORD_OPS = 1 << 2, /**< Object, Predicate, Subject */
- SORD_OSP = 1 << 3, /**< Object, Subject, Predicate */
- SORD_PSO = 1 << 4, /**< Predicate, Subject, Object */
- SORD_POS = 1 << 5 /**< Predicate, Object, Subject */
+ SORD_SPO = 1U, /**< Subject, Predicate, Object */
+ SORD_SOP = 1U << 1U, /**< Subject, Object, Predicate */
+ SORD_OPS = 1U << 2U, /**< Object, Predicate, Subject */
+ SORD_OSP = 1U << 3U, /**< Object, Subject, Predicate */
+ SORD_PSO = 1U << 4U, /**< Predicate, Subject, Object */
+ SORD_POS = 1U << 5U /**< Predicate, Object, Subject */
} SordIndexOption;
/**
diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build
index 50dabb9..1be55fe 100644
--- a/meson/suppressions/meson.build
+++ b/meson/suppressions/meson.build
@@ -38,6 +38,13 @@ if is_variable('cc')
]
endif
+ if host_machine.system() == 'windows'
+ c_suppressions += [
+ '-Wno-deprecated-declarations',
+ '-Wno-nonportable-system-include-path',
+ ]
+ endif
+
elif cc.get_id() == 'gcc'
c_suppressions += [
'-Wno-cast-align',