[vlc-commits] Don't use "None" in an enum, it's too common
Jean-Baptiste Kempf
git at videolan.org
Mon Jun 15 13:19:01 CEST 2015
libvlcpp | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jun 14 01:06:53 2015 +0200| [49f7c9b1048c8ec94487000761303d44cd10d77a] | committer: Hugo Beauzée-Luyssen
Don't use "None" in an enum, it's too common
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> http://git.videolan.org/gitweb.cgi/libvlcpp.git/?a=commit;h=49f7c9b1048c8ec94487000761303d44cd10d77a
---
vlcpp/common.hpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/vlcpp/common.hpp b/vlcpp/common.hpp
index df21975..5da8bfd 100644
--- a/vlcpp/common.hpp
+++ b/vlcpp/common.hpp
@@ -218,7 +218,7 @@ namespace VLC
enum class BoxingStrategy
{
/// No boxing required.
- None,
+ NoBoxing,
/// Used to create the Opaque wrapper and setup pointers
Setup,
/// Unbox CallbackOwner/user callback pointers
@@ -244,9 +244,9 @@ namespace VLC
struct GuessBoxingStrategy<std::nullptr_t, Strategy_>
{
#if !defined(_MSC_VER) || _MSC_VER >= 1900
- static constexpr BoxingStrategy Strategy = BoxingStrategy::None;
+ static constexpr BoxingStrategy Strategy = BoxingStrategy::NoBoxing;
#else
- static const BoxingStrategy Strategy = BoxingStrategy::None;
+ static const BoxingStrategy Strategy = BoxingStrategy::NoBoxing;
#endif
};
@@ -318,7 +318,7 @@ namespace VLC
// Otherwise, we assume there is no Opaque wrapper, and therefore the
// pointer we receive already is our CallbackOwner instance.
template <int NbEvents>
- struct BoxOpaque<NbEvents, BoxingStrategy::None>
+ struct BoxOpaque<NbEvents, BoxingStrategy::NoBoxing>
{
template <typename... Args>
BoxOpaque(void* ptr, Args...) : m_ptr( reinterpret_cast<CallbackOwner<NbEvents>*>( ptr ) ) {}
More information about the vlc-commits
mailing list