include: move proptag_t/proptype_t etc. into namespace gromox

Author: jengelh

include/gromox/exmdb_idef.hpp

@@ -132,7 +132,7 @@ EXMIDL(vacuum, (const char *dir))
 EXMIDL(unload_store, (const char *dir))
 EXMIDL(notify_new_mail, (const char *dir, uint64_t folder_id, uint64_t message_id))
 EXMIDL(store_eid_to_user, (const char *dir, const STORE_ENTRYID *store_eid, IDLOUT char **maildir, unsigned int *user_id, unsigned int *domain_id))
-EXMIDL(purge_softdelete, (const char *dir, const char *username, uint64_t folder_id, uint32_t del_flags, mapitime_t cutoff))
+EXMIDL(purge_softdelete, (const char *dir, const char *username, uint64_t folder_id, uint32_t del_flags, gromox::mapitime_t cutoff))
 EXMIDL(purge_datafiles, (const char *dir))
 EXMIDL(autoreply_tsquery, (const char *dir, const char *peer, uint64_t window, IDLOUT uint64_t *tdiff))
 EXMIDL(autoreply_tsupdate, (const char *dir, const char *peer))

include/gromox/exmdb_rpc.hpp

@@ -836,7 +836,7 @@ struct exreq_purge_softdelete final : public exreq {
 	char *username;
 	uint64_t folder_id = 0;
 	uint32_t del_flags = 0;
-	mapitime_t cutoff = 0;
+	gromox::mapitime_t cutoff = 0;
 };
 
 struct exreq_autoreply_tsquery final : public exreq {

include/gromox/mapidefs.h

@@ -10,17 +10,27 @@
 #include <type_traits>
 #include <gromox/defs.h>
 
-#define PROP_ID(x) static_cast<uint16_t>((x) >> 16)
-#define PROP_TYPE(x) static_cast<uint16_t>((x) & 0xFFFF)
-#define CHANGE_PROP_TYPE(tag, newtype) static_cast<uint32_t>(((tag) & ~0xFFFF) | (newtype))
+namespace gromox {
+
+using propid_t = uint16_t;
+using proptype_t = uint16_t;
+using proptag_t = uint32_t;
+/* N.B.: PidLids are not propids (they are also 32-bit wide) */
+using mapitime_t = uint64_t;
+
+}
+
+#define PROP_ID(x) static_cast<gromox::propid_t>((x) >> 16)
+#define PROP_TYPE(x) static_cast<gromox::proptype_t>((x) & 0xFFFF)
+#define CHANGE_PROP_TYPE(tag, newtype) static_cast<gromox::proptag_t>(((tag) & ~0xFFFF) | (newtype))
 
 /*
  * x|y yields an unsigned result if either x or y are unsigned.
  * x<<y yields unsigned only if x is unsigned.
  * All the while | and << only make *sense* in an unsigned _context_ anyway
  * (i.e. the operator should have returned unsigned all the time)
  */
-#define PROP_TAG(type, tag) static_cast<uint32_t>((static_cast<uint32_t>(tag) << 16) | (type))
+#define PROP_TAG(type, tag) static_cast<gromox::proptag_t>((static_cast<uint32_t>(tag) << 16) | (type))
 namespace {
 enum {
 	/*
@@ -76,11 +86,8 @@ enum {
 	PT_MV_CLSID = 0x1048, /* PtypMultipleGuid */
 	PT_MV_BINARY = 0x1102, /* PtypMultipleBinary */
 };
-using proptype_t = decltype(PT_NULL);
 }
 
-using mapitime_t = uint64_t;
-
 #include "mapitags.hpp"
 
 enum {
@@ -1053,7 +1060,7 @@ struct GX_EXPORT PROPERTY_XNAME {
 	std::string name;
 };
 
-using PROPID_ARRAY = std::vector<uint16_t>;
+using PROPID_ARRAY = std::vector<gromox::propid_t>;
 
 struct PROPNAME_ARRAY {
 	uint16_t count;

include/gromox/mapitags.hpp

@@ -1113,7 +1113,6 @@ enum {
 	PR_EMS_AB_PARENT_ENTRYID = PROP_TAG(PT_BINARY, 0xFFFC), /* PidTagAddressBookParentEntryId */
 	PR_EMS_AB_CONTAINERID = PROP_TAG(PT_LONG, 0xFFFD), /* PidTagAddressBookContainerId */
 };
-using proptag_t = decltype(PR_NULL);
 }
 
 enum {