Add return value to some InputStream methods

This commit is contained in:
Vinnie Falco
2013-07-31 09:43:22 -07:00
parent f0cc73df9e
commit ea4c0aa8a2
5 changed files with 38 additions and 9 deletions

View File

@@ -998,6 +998,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\protocol\ripple_ProxyProtocol.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp" />
<ClCompile Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1557,6 +1563,7 @@
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_RPCServer.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.h" />
<ClInclude Include="..\..\modules\ripple_net\protocol\ripple_ProxyProtocol.h" />
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h" />
<ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h" />
<ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h" />

View File

@@ -160,6 +160,9 @@
<Filter Include="[2] Build">
<UniqueIdentifier>{c69b07a2-44e5-4b06-99a9-81f5d137ea15}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_net\protocol">
<UniqueIdentifier>{f0308442-e7af-44d4-a76a-c91fbf685e10}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Subtrees\sqlite\sqlite3.c">
@@ -882,6 +885,9 @@
<ClCompile Include="..\..\modules\ripple_app\main\ripple_FatalErrorReporter.cpp">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\protocol\ripple_ProxyProtocol.cpp">
<Filter>[1] Ripple\ripple_net\protocol</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1670,6 +1676,9 @@
<ClInclude Include="..\..\BeastConfig.h">
<Filter>[2] Build</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\protocol\ripple_ProxyProtocol.h">
<Filter>[1] Ripple\ripple_net\protocol</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

View File

@@ -239,14 +239,19 @@ public:
/** Reads a type using a template specialization.
The variable is passed as a parameter so that the template type
can be deduced.
can be deduced. The return value indicates whether or not there
was sufficient data in the stream to read the value.
This is useful when doing template meta-programming.
*/
template <class T>
void readTypeInto (T* p)
bool readTypeInto (T* p)
{
*p = readType <T> ();
if (getNumBytesRemaining () >= sizeof (T))
{
*p = readType <T> ();
return true;
}
return false;
}
/** Reads a type from a big endian stream using a template specialization.
@@ -262,14 +267,18 @@ public:
/** Reads a type using a template specialization.
The variable is passed as a parameter so that the template type
can be deduced.
This is useful when doing template meta-programming.
can be deduced. The return value indicates whether or not there
was sufficient data in the stream to read the value.
*/
template <class T>
void readTypeBigEndianInto (T* p)
bool readTypeBigEndianInto (T* p)
{
*p = readTypeBigEndian <T> ();
if (getNumBytesRemaining () >= sizeof (T))
{
*p = readTypeBigEndian <T> ();
return true;
}
return false;
}
//==============================================================================

View File

@@ -25,4 +25,6 @@ namespace ripple
#include "basics/ripple_RPCServer.cpp"
#include "basics/ripple_SNTPClient.cpp"
#include "protocol/ripple_ProxyProtocol.cpp"
}

View File

@@ -32,6 +32,8 @@ namespace ripple
#include "basics/ripple_RPCServer.h"
#include "basics/ripple_SNTPClient.h"
#include "protocol/ripple_ProxyProtocol.h"
}
#endif