From: <cin...@us...> - 2012-08-03 12:42:00
|
Revision: 54771 http://firebird.svn.sourceforge.net/firebird/?rev=54771&view=rev Author: cincura_net Date: 2012-08-03 12:41:54 +0000 (Fri, 03 Aug 2012) Log Message: ----------- Conditionals cleanup. Modified Paths: -------------- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderServices.cs Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs 2012-08-03 12:33:05 UTC (rev 54770) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbConnectionInternal.cs 2012-08-03 12:41:54 UTC (rev 54771) @@ -617,7 +617,7 @@ System.Reflection.Assembly assembly = System.Reflection.Assembly.GetEntryAssembly(); if (assembly != null) { -#if (NET_40) +#if (!NET_35) if (assembly.IsFullyTrusted) return Process.GetCurrentProcess().Id; else Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs 2012-08-03 12:33:05 UTC (rev 54770) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs 2012-08-03 12:41:54 UTC (rev 54771) @@ -441,7 +441,7 @@ return XmlReader.Create(stream); } -#if (NET_40) +#if (!NET_35) public override bool SupportsEscapingLikeArgument(out char escapeCharacter) { escapeCharacter = LikeEscapeCharacter; Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderServices.cs =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderServices.cs 2012-08-03 12:33:05 UTC (rev 54770) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderServices.cs 2012-08-03 12:41:54 UTC (rev 54771) @@ -410,7 +410,7 @@ return FbDbType.Binary; } -#if (NET_40) +#if (!NET_35) protected override void DbCreateDatabase(DbConnection connection, int? commandTimeout, StoreItemCollection storeItemCollection) { FbConnection fbConnection = CheckAndCastToFbConnection(connection); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |