byte order: move declarations into namespace NSROOT

Author: janbar

noson/src/private/byteorder.h

@@ -19,8 +19,10 @@
 #ifndef BYTEORDER_H
 #define BYTEORDER_H
 
-#include <inttypes.h>
-#include <string.h>
+#include "local_config.h"
+
+#include <cinttypes>
+#include <cstring>
 
 #ifndef BYTE_ORDER
 #define LITTLE_ENDIAN     1234
@@ -31,6 +33,8 @@ extern int __endianess__;
 #define is_big_endian     (BYTE_ORDER == BIG_ENDIAN)
 #define is_little_endian  (BYTE_ORDER == LITTLE_ENDIAN)
 
+namespace NSROOT
+{
 
 template <typename T> inline T fromUnaligned(const void * data)
 {
@@ -44,24 +48,24 @@ template <typename T> inline void toUnaligned(void * data, T val)
   memcpy(data, &val, sizeof(T));
 }
 
-static inline int8_t read8(const void * data)
+inline int8_t read8(const void * data)
 {
   return fromUnaligned<int8_t>(data);
 }
 
-static inline void write8(void * data, int8_t val)
+inline void write8(void * data, int8_t val)
 {
   toUnaligned(data, val);
 }
 
-static inline int16_t swap16(int16_t val)
+inline int16_t swap16(int16_t val)
 {
   return (int16_t)(0 |
           (((uint32_t)val & 0x00ff) << 8) |
           (((uint32_t)val & 0xff00) >> 8));
 }
 
-static inline int32_t swap32(int32_t val)
+inline int32_t swap32(int32_t val)
 {
   return (int32_t)(0 |
           (((uint32_t)val & 0x000000ff) << 24) |
@@ -71,39 +75,39 @@ static inline int32_t swap32(int32_t val)
           );
 }
 
-static inline int16_t read16le(const void * data)
+inline int16_t read16le(const void * data)
 {
   int16_t val = fromUnaligned<int16_t>(data);
   if (is_little_endian)
     return val;
   return swap16(val);
 }
 
-static inline void write16le(void * data, int16_t val)
+inline void write16le(void * data, int16_t val)
 {
   if (is_little_endian)
     toUnaligned(data, val);
   else
     toUnaligned(data, swap16(val));
 }
 
-static inline int16_t read16be(const void * data)
+inline int16_t read16be(const void * data)
 {
   int16_t val = fromUnaligned<int16_t>(data);
   if (is_big_endian)
     return val;
   return swap16(val);
 }
 
-static inline void write16be(void * data, int16_t val)
+inline void write16be(void * data, int16_t val)
 {
   if (is_big_endian)
     toUnaligned(data, val);
   else
     toUnaligned(data, swap16(val));
 }
 
-static inline int32_t read24le(const void * data)
+inline int32_t read24le(const void * data)
 {
   const char * p = (const char*)data;
   int32_t val = fromUnaligned<uint8_t>(&p[2]) << 16;
@@ -114,7 +118,7 @@ static inline int32_t read24le(const void * data)
   return val;
 }
 
-static inline int32_t read24be(const void * data)
+inline int32_t read24be(const void * data)
 {
   const char * p = (const char*)data;
   int32_t val = fromUnaligned<uint8_t>(&p[0]) << 16;
@@ -125,37 +129,39 @@ static inline int32_t read24be(const void * data)
   return val;
 }
 
-static inline int32_t read32le(const void * data)
+inline int32_t read32le(const void * data)
 {
   int32_t val = fromUnaligned<int32_t>(data);
   if (is_little_endian)
     return val;
   return swap32(val);
 }
 
-static inline void write32le(void * data, int32_t val)
+inline void write32le(void * data, int32_t val)
 {
   if (is_little_endian)
     toUnaligned(data, val);
   else
     toUnaligned(data, swap32(val));
 }
 
-static inline int32_t read32be(const void * data)
+inline int32_t read32be(const void * data)
 {
   int32_t val = fromUnaligned<int32_t>(data);
   if (is_big_endian)
     return val;
   return swap32(val);
 }
 
-static inline void write32be(void * data, int32_t val)
+inline void write32be(void * data, int32_t val)
 {
   if (is_big_endian)
     toUnaligned(data, val);
   else
     toUnaligned(data, swap32(val));
 }
 
+}
+
 #endif /* BYTEORDER_H */