Diction unified.

include/detail/scope_guard_base.h

@@ -50,7 +50,7 @@ namespace detail
             std::enable_if_t<(!std::is_lvalue_reference<EFP>::value)
                                 && std::is_nothrow_constructible<EF, EFP>::value, int> = 0
             >
-        explicit scope_guard_base(EFP&& exitFunction) : m_exitFunction(std::move(exitFunction)),
+        explicit scope_guard_base(EFP&& exitFunction) : m_exitfunction(std::move(exitFunction)),
                                                     m_execute_on_destruction(true)
         {
         }
@@ -59,7 +59,7 @@ namespace detail
             std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
             std::enable_if_t<std::is_lvalue_reference<EFP>::value, int> = 0
             >
-        explicit scope_guard_base(EFP&& exitFunction) try : m_exitFunction(exitFunction),
+        explicit scope_guard_base(EFP&& exitFunction) try : m_exitfunction(exitFunction),
                                                         m_execute_on_destruction(true)
         {
         }
@@ -72,7 +72,7 @@ namespace detail
         scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<EF>::value
                                                             || std::is_nothrow_copy_constructible<EF>::value)
                                         : Strategy(other),
-                                        m_exitFunction(std::move_if_noexcept(other.m_exitFunction)),
+                                        m_exitfunction(std::move_if_noexcept(other.m_exitfunction)),
                                         m_execute_on_destruction(other.m_execute_on_destruction)
         {
             other.release();
@@ -85,7 +85,7 @@ namespace detail
         {
             if( (m_execute_on_destruction == true) && (this->should_execute() == true) )
             {
-                m_exitFunction();
+                m_exitfunction();
             }
         }
 
@@ -102,7 +102,7 @@ namespace detail
 
     private:
 
-        EF m_exitFunction;
+        EF m_exitfunction;
         bool m_execute_on_destruction;
     };
 

include/unique_resource.h

@@ -221,10 +221,10 @@ namespace sr
                                                             noexcept(std::is_nothrow_constructible<std::decay_t<R>, R>::value
                                                                     && std::is_nothrow_constructible<std::decay_t<D>, D>::value)
     {
-        const bool mustRelease{r == invalid};
+        const bool must_release{r == invalid};
         auto ur = make_unique_resource(r, d);
 
-        if( mustRelease == true )
+        if( must_release == true )
         {
             ur.release();
         }