#if !defined( INCLUDED_BYTESTREAMUTILS_H )
#define INCLUDED_BYTESTREAMUTILS_H
-#if defined( __GNUC__ )
+#include "globaldefs.h"
+
+#if GDEF_COMPILER_GNU
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
template<typename InputStreamType, typename Type>
inline void istream_read_little_endian( InputStreamType& istream, Type& value ){
- istream.read( reinterpret_cast<typename InputStreamType::byte_type*>( &value ), sizeof( Type ) );
-#if defined( __BIG_ENDIAN__ )
- std::reverse( reinterpret_cast<typename InputStreamType::byte_type*>( &value ), reinterpret_cast<typename InputStreamType::byte_type*>( &value ) + sizeof( Type ) );
-#endif
+ istream.read(reinterpret_cast<typename InputStreamType::byte_type *>( &value ), sizeof(Type));
+ if (GDEF_ARCH_ENDIAN_BIG) {
+ std::reverse(reinterpret_cast<typename InputStreamType::byte_type *>( &value ),
+ reinterpret_cast<typename InputStreamType::byte_type *>( &value ) + sizeof(Type));
+ }
}
template<typename InputStreamType, typename Type>
inline void istream_read_big_endian( InputStreamType& istream, Type& value ){
- istream.read( reinterpret_cast<typename InputStreamType::byte_type*>( &value ), sizeof( Type ) );
-#if !defined( __BIG_ENDIAN__ )
- std::reverse( reinterpret_cast<typename InputStreamType::byte_type*>( &value ), reinterpret_cast<typename InputStreamType::byte_type*>( &value ) + sizeof( Type ) );
-#endif
+ istream.read(reinterpret_cast<typename InputStreamType::byte_type *>( &value ), sizeof(Type));
+ if (!GDEF_ARCH_ENDIAN_BIG) {
+ std::reverse(reinterpret_cast<typename InputStreamType::byte_type *>( &value ),
+ reinterpret_cast<typename InputStreamType::byte_type *>( &value ) + sizeof(Type));
+ }
}
template<typename InputStreamType>
return value;
}
+template<typename InputStreamType>
+inline int16_t istream_read_int16_be( InputStreamType& istream ){
+ int16_t value;
+ istream_read_big_endian( istream, value );
+ return value;
+}
+
template<typename InputStreamType>
inline uint16_t istream_read_uint16_le( InputStreamType& istream ){
uint16_t value;
return value;
}
+template<typename InputStreamType>
+inline uint16_t istream_read_uint16_be( InputStreamType& istream ){
+ uint16_t value;
+ istream_read_big_endian( istream, value );
+ return value;
+}
+
template<typename InputStreamType>
inline int32_t istream_read_int32_le( InputStreamType& istream ){
int32_t value;
return value;
}
+template<typename InputStreamType>
+inline int32_t istream_read_int32_be( InputStreamType& istream ){
+ int32_t value;
+ istream_read_big_endian( istream, value );
+ return value;
+}
+
template<typename InputStreamType>
inline uint32_t istream_read_uint32_le( InputStreamType& istream ){
uint32_t value;
return value;
}
+template<typename InputStreamType>
+inline uint32_t istream_read_uint32_be( InputStreamType& istream ){
+ uint32_t value;
+ istream_read_big_endian( istream, value );
+ return value;
+}
+
template<typename InputStreamType>
inline float istream_read_float32_le( InputStreamType& istream ){
float value;
return value;
}
+template<typename InputStreamType>
+inline float istream_read_float32_be( InputStreamType& istream ){
+ float value;
+ istream_read_big_endian( istream, value );
+ return value;
+}
+
template<typename InputStreamType>
inline typename InputStreamType::byte_type istream_read_byte( InputStreamType& istream ){
typename InputStreamType::byte_type b;