Get rid of initialization order warning

diff --git a/libmapi++/attachment.h b/libmapi++/attachment.h
index ac9c6dd917a6ddad5dbb35a1c503762055e05cb6..01c851af0136e5c1efb71fe805bce8d4cedf5dde 100644 (file)
--- a/libmapi++/attachment.h
+++ b/libmapi++/attachment.h
@@ -65,7 +65,7 @@ class attachment : public object {
                        // Don't load PR_ATTACH_DATA_BIN if it's embedded in message.
                        // NOTE: Use RopOpenEmbeddedMessage when it is implemented.
                        const uint32_t attach_method = *static_cast<const uint32_t*>(properties[PR_ATTACH_METHOD]);
-                       if (attach_method == ATTACH_EMBEDDED_MSG)
+                       if (attach_method != ATTACH_BY_VALUE)
                                return;
 
                        // Get Binary Data.

diff --git a/libmapi++/object.h b/libmapi++/object.h
index 5bc7ec95bfaf50971bd7b8ff94ccfac060d20659..463d3da428baafd505651ac292637a2b6fe4b539 100644 (file)
--- a/libmapi++/object.h
+++ b/libmapi++/object.h
@@ -44,7 +44,7 @@ class object {
                /** \brief Object Constructor
                 *  \param mapi_session Session this object is to be associated with.
                 */
-               object(session& mapi_session, const std::string& object_type = "") throw() : m_object_type(object_type), m_session(mapi_session)
+               object(session& mapi_session, const std::string& object_type = "") throw() : m_session(mapi_session), m_object_type(object_type)
                {
                        mapi_object_init(&m_object);
                }