include/i18nlangtag/lang.h | 4 ++-- include/o3tl/strong_int.hxx | 3 +-- include/sfx2/shell.hxx | 3 +-- include/svl/undo.hxx | 3 +-- include/svx/svdtypes.hxx | 3 +-- 5 files changed, 6 insertions(+), 10 deletions(-)
New commits: commit a28a839b9f9eeec1544c5ceeeabe7b1083ce1655 Author: Noel Grandin <[email protected]> Date: Thu May 24 21:43:08 2018 +0200 no need declare these tag structs separately Change-Id: I00f336ee4eced431155c79bee6e2373e145ae95c Reviewed-on: https://gerrit.libreoffice.org/54780 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 84adccafc6bf..d49b701d94c8 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -83,8 +83,8 @@ #include <sal/types.h> #include <o3tl/strong_int.hxx> #include <ostream> -struct LanguageTypeTag {}; -typedef o3tl::strong_int<sal_uInt16, LanguageTypeTag> LanguageType; + +typedef o3tl::strong_int<sal_uInt16, struct LanguageTypeTag> LanguageType; inline std::ostream& operator<<(std::ostream& os, LanguageType const & lt) { os << sal_uInt16(lt); return os; } constexpr LanguageType primary(LanguageType lt) { return LanguageType(sal_uInt16(lt) & 0x03ff); } diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx index c0378e344c69..bdb60b30fb69 100644 --- a/include/o3tl/strong_int.hxx +++ b/include/o3tl/strong_int.hxx @@ -75,8 +75,7 @@ isInRange(T2 value) { /// Wrap up an integer type so that we prevent accidental conversion to other integer types. /// /// e.g. -/// struct MyIntTag {}; -/// typedef o3tl::strong_int<unsigned, MyIntTag> MyInt; +/// typedef o3tl::strong_int<unsigned, struct MyIntTag> MyInt; /// /// \param UNDERLYING_TYPE the underlying scalar type /// \param PHANTOM_TYPE a type tag, used to distinguish this instantiation of the template diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index e3339e9de113..8b6bd28dbe30 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -66,8 +66,7 @@ namespace svl Id for <SfxInterface>s, gives a quasi-static access to the interface through an array to <SfxApplication>. */ -struct SfxInterfaceIdTag {}; -typedef o3tl::strong_int<sal_uInt16, SfxInterfaceIdTag> SfxInterfaceId; +typedef o3tl::strong_int<sal_uInt16, struct SfxInterfaceIdTag> SfxInterfaceId; constexpr auto SFX_INTERFACE_NONE = SfxInterfaceId(0); constexpr auto SFX_INTERFACE_SFXAPP = SfxInterfaceId(1); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index b0ee7e21f657..e91aca41a69a 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -29,8 +29,7 @@ struct MarkedUndoAction; -struct ViewShellIdTag; -typedef o3tl::strong_int<sal_Int32, ViewShellIdTag> ViewShellId; +typedef o3tl::strong_int<sal_Int32, struct ViewShellIdTag> ViewShellId; class SVL_DLLPUBLIC SfxRepeatTarget { diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index 38e41fa45a92..f6c6b36e6971 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -56,8 +56,7 @@ enum class SdrDragMode // You can use this value in the methods of SdrLayerSet, but false is returned // every time or the method does nothing. // type declaration for Layer-IDs -struct SdrLayerIDTag {}; -typedef o3tl::strong_int<sal_uInt8,SdrLayerIDTag> SdrLayerID; +typedef o3tl::strong_int<sal_uInt8, struct SdrLayerIDTag> SdrLayerID; // If there is no layer when it should be identified, then // SdrLayerAdmin::GetLayerID(const String&) returns a value. _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
