From 83e8f713fbdae035b4602092ad89fd2a1f013fce Mon Sep 17 00:00:00 2001
From: asfernandes <asfernandes@users.sourceforge.net>
Date: Fri, 16 Jan 2015 15:12:25 +0000
Subject: [PATCH] Adjustments after fix and test of fbstuff repository.

---
 src/include/firebird/Interface.h | 2 +-
 src/include/firebird/Message.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/include/firebird/Interface.h b/src/include/firebird/Interface.h
index 45c06fe3d9..13048a74a0 100644
--- a/src/include/firebird/Interface.h
+++ b/src/include/firebird/Interface.h
@@ -155,8 +155,8 @@ namespace Firebird
 	public:
 		virtual void dispose()
 		{
+			// Disposes only the delegated status. Let the user destroy this instance.
 			status->dispose();
-			delete this;
 		}
 
 		virtual void init()
diff --git a/src/include/firebird/Message.h b/src/include/firebird/Message.h
index 72f1f79f51..71c551de83 100644
--- a/src/include/firebird/Message.h
+++ b/src/include/firebird/Message.h
@@ -63,7 +63,7 @@
 		}	\
 		\
 		template <typename StatusType>	\
-		name(::Firebird::IMaster* master, StatusType* status)	\
+		name(StatusType* status, ::Firebird::IMaster* master)	\
 			: desc(master, status, FB_BOOST_PP_SEQ_SIZE(fields), &setup<StatusType>)	\
 		{	\
 		}	\