diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Src/Net/OVR_BitStream.h | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVR/Src/Net/OVR_BitStream.h')
| -rw-r--r-- | LibOVR/Src/Net/OVR_BitStream.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/LibOVR/Src/Net/OVR_BitStream.h b/LibOVR/Src/Net/OVR_BitStream.h index b1ddc8f..4e2d2ef 100644 --- a/LibOVR/Src/Net/OVR_BitStream.h +++ b/LibOVR/Src/Net/OVR_BitStream.h @@ -29,9 +29,13 @@ limitations under the License. #define OVR_Bitstream_h #include <math.h> -#include "../Kernel/OVR_Types.h" -#include "../Kernel/OVR_Std.h" -#include "../Kernel/OVR_String.h" +#include "Kernel/OVR_Types.h" +#include "Kernel/OVR_Std.h" +#include "Kernel/OVR_String.h" + +#if defined(OVR_CC_MSVC) +#pragma warning(push) +#endif namespace OVR { namespace Net { @@ -76,6 +80,9 @@ public: /// Resets the bitstream for reuse. void Reset( void ); + // Releases the current data and points the bitstream at the provided buffer + void WrapBuffer(unsigned char* data, const unsigned int lengthInBytes); + /// \brief Bidirectional serialize/deserialize any integral type to/from a bitstream. /// \details Undefine __BITSTREAM_NATIVE_END if you need endian swapping. /// \param[in] writeToBitstream true to write from your data to this bitstream. False to read from this bitstream and write to your data @@ -1741,4 +1748,8 @@ BitStream& operator>>(BitStream& in, templateType& c) }} // OVR::Net +#if defined(OVR_CC_MSVC) +#pragma warning(pop) +#endif + #endif |