[Firebird-checkins] CVS: firebird2/src/jrd PreparedStatement.cpp, 1.15, 1.16 PreparedStatement.h, 1.7, 1.8 ValuesImpl.h, 1.5, 1.6

[Adriano d. S. F. <asf...@us...>]

Build Version :  T3.0.0.25974 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.26143 2009/10/31 22:35:49 asfernandes )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21130/src/jrd

Modified Files:
	PreparedStatement.cpp PreparedStatement.h ValuesImpl.h 
Log Message:
Misc

Index: PreparedStatement.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/PreparedStatement.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -U3 -r1.15 -r1.16
--- PreparedStatement.cpp	30 Oct 2009 10:50:59 -0000	1.15
+++ PreparedStatement.cpp	31 Oct 2009 22:35:48 -0000	1.16
@@ -51,9 +51,9 @@
 namespace Jrd {
 
 
-PreparedStatement::PreparedStatement(thread_db* tdbb, Firebird::MemoryPool& pool,
-			Attachment* attachment, jrd_tra* transaction, const Firebird::string& text)
-	: Firebird::PermanentStorage(pool),
+PreparedStatement::PreparedStatement(thread_db* tdbb, MemoryPool& pool,
+			Attachment* attachment, jrd_tra* transaction, const string& text)
+	: PermanentStorage(pool),
 	  inValues(pool),
 	  outValues(pool),
 	  inBlr(pool),
@@ -77,7 +77,7 @@
 		if (request->req_receive)
 			parseDsqlMessage(request->req_receive, outValues, outBlr, outMessage);
 	}
-	catch (const Firebird::Exception&)
+	catch (const Exception&)
 	{
 		DSQL_free_statement(tdbb, request, DSQL_drop);
 		throw;
@@ -139,8 +139,8 @@
 }
 
 
-void PreparedStatement::parseDsqlMessage(dsql_msg* dsqlMsg, Firebird::Array<dsc>& values,
-	Firebird::UCharBuffer& blr, Firebird::UCharBuffer& msg)
+void PreparedStatement::parseDsqlMessage(dsql_msg* dsqlMsg, Array<dsc>& values,
+	UCharBuffer& blr, UCharBuffer& msg)
 {
 	// hvlad: Parameters in dsqlMsg->msg_parameters almost always linked in descending
 	// order by par_index. The only known exception is EXECUTE BLOCK statement.
@@ -229,7 +229,7 @@
 }
 
 
-void PreparedStatement::generateBlr(const dsc* desc, Firebird::UCharBuffer& blr)
+void PreparedStatement::generateBlr(const dsc* desc, UCharBuffer& blr)
 {
 	USHORT length = 0;
 

Index: PreparedStatement.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/PreparedStatement.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -U3 -r1.7 -r1.8
--- PreparedStatement.h	21 Oct 2009 00:42:25 -0000	1.7
+++ PreparedStatement.h	31 Oct 2009 22:35:48 -0000	1.8
@@ -89,7 +89,8 @@
 		return request;
 	}
 
-	static void parseDsqlMessage(dsql_msg* dsqlMsg, Firebird::Array<dsc>& values, Firebird::UCharBuffer& blr, Firebird::UCharBuffer& msg);
+	static void parseDsqlMessage(dsql_msg* dsqlMsg, Firebird::Array<dsc>& values,
+		Firebird::UCharBuffer& blr, Firebird::UCharBuffer& msg);
 	static void generateBlr(const dsc* desc, Firebird::UCharBuffer& blr);
 
 private:

Index: ValuesImpl.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/ValuesImpl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- ValuesImpl.h	30 Oct 2009 10:57:56 -0000	1.5
+++ ValuesImpl.h	31 Oct 2009 22:35:48 -0000	1.6
@@ -119,7 +119,6 @@
 	{
 	}
 
-
 private:
 	// copying is prohibited
 	ValuesImpl(const ValuesImpl&);