|
From: <ale...@us...> - 2014-09-03 13:51:57
|
Revision: 60029
http://sourceforge.net/p/firebird/code/60029
Author: alexpeshkoff
Date: 2014-09-03 13:51:48 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
Fixed VC10 build
Modified Paths:
--------------
firebird/trunk/builds/win32/msvc10/engine.vcxproj
firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters
firebird/trunk/src/remote/os/win32/wnet.cpp
Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2014-09-03 11:35:12 UTC (rev 60028)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2014-09-03 13:51:48 UTC (rev 60029)
@@ -65,6 +65,7 @@
<ClCompile Include="..\..\..\src\jrd\cvt2.cpp" />
<ClCompile Include="..\..\..\src\jrd\Database.cpp" />
<ClCompile Include="..\..\..\src\jrd\DataTypeUtil.cpp" />
+ <ClCompile Include="..\..\..\src\jrd\DbCreators.cpp" />
<ClCompile Include="..\..\..\src\jrd\DebugInterface.cpp" />
<ClCompile Include="..\..\..\src\jrd\err.cpp" />
<ClCompile Include="..\..\..\src\jrd\event.cpp" />
Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2014-09-03 11:35:12 UTC (rev 60028)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2014-09-03 13:51:48 UTC (rev 60029)
@@ -456,6 +456,7 @@
<ClCompile Include="..\..\..\src\jrd\Mapping.cpp">
<Filter>JRD files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\jrd\DbCreators.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@@ -977,6 +978,7 @@
<ClInclude Include="..\..\..\src\jrd\Mapping.h">
<Filter>Header files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\jrd\Monitoring.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\dsql\DdlNodes.epp">
Modified: firebird/trunk/src/remote/os/win32/wnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/wnet.cpp 2014-09-03 11:35:12 UTC (rev 60028)
+++ firebird/trunk/src/remote/os/win32/wnet.cpp 2014-09-03 13:51:48 UTC (rev 60029)
@@ -1332,9 +1332,9 @@
{
LocalStatus st;
port->port_crypt_plugin->decrypt(&st, n, buffer, buffer);
- if (!st.isSuccess())
+ if (st.getStatus() & IStatus::FB_HAS_ERRORS)
{
- status_exception::raise(st.get());
+ status_exception::raise(&st);
}
}
@@ -1371,9 +1371,9 @@
char* d = b.getBuffer(buffer_length);
port->port_crypt_plugin->encrypt(&st, buffer_length, data, d);
- if (!st.isSuccess())
+ if (st.getStatus() & IStatus::FB_HAS_ERRORS)
{
- status_exception::raise(st.get());
+ status_exception::raise(&st);
}
data = d;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|