Merge pull request #10 from je4d/master

d-frey · web-flow · commit 492a197e8a37 · 2017-06-28T06:14:24.000+02:00
Make byte's non-constexpr operators inline
diff --git a/include/tao/json/byte.hpp b/include/tao/json/byte.hpp
@@ -58,7 +58,7 @@ namespace tao
          return byte( static_cast< unsigned char >( b ) >> shift );
       }
 
-      byte& operator|=( byte& l, byte r ) noexcept
+      inline byte& operator|=( byte& l, byte r ) noexcept
       {
          return l = byte( static_cast< unsigned char >( l ) | static_cast< unsigned char >( r ) );
       }
@@ -68,7 +68,7 @@ namespace tao
          return byte( static_cast< unsigned char >( l ) | static_cast< unsigned char >( r ) );
       }
 
-      byte& operator&=( byte& l, byte r ) noexcept
+      inline byte& operator&=( byte& l, byte r ) noexcept
       {
          return l = byte( static_cast< unsigned char >( l ) & static_cast< unsigned char >( r ) );
       }
@@ -78,7 +78,7 @@ namespace tao
          return byte( static_cast< unsigned char >( l ) & static_cast< unsigned char >( r ) );
       }
 
-      byte& operator^=( byte& l, byte r ) noexcept
+      inline byte& operator^=( byte& l, byte r ) noexcept
       {
          return l = byte( static_cast< unsigned char >( l ) ^ static_cast< unsigned char >( r ) );
       }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ namespace tao`
`58`	`58`	`return byte( static_cast< unsigned char >( b ) >> shift );`
`59`	`59`	`}`
`60`	`60`
`61`		`- byte& operator\|=( byte& l, byte r ) noexcept`
	`61`	`+ inline byte& operator\|=( byte& l, byte r ) noexcept`
`62`	`62`	`{`
`63`	`63`	`return l = byte( static_cast< unsigned char >( l ) \| static_cast< unsigned char >( r ) );`
`64`	`64`	`}`
`@@ -68,7 +68,7 @@ namespace tao`
`68`	`68`	`return byte( static_cast< unsigned char >( l ) \| static_cast< unsigned char >( r ) );`
`69`	`69`	`}`
`70`	`70`
`71`		`- byte& operator&=( byte& l, byte r ) noexcept`
	`71`	`+ inline byte& operator&=( byte& l, byte r ) noexcept`
`72`	`72`	`{`
`73`	`73`	`return l = byte( static_cast< unsigned char >( l ) & static_cast< unsigned char >( r ) );`
`74`	`74`	`}`
`@@ -78,7 +78,7 @@ namespace tao`
`78`	`78`	`return byte( static_cast< unsigned char >( l ) & static_cast< unsigned char >( r ) );`
`79`	`79`	`}`
`80`	`80`
`81`		`- byte& operator^=( byte& l, byte r ) noexcept`
	`81`	`+ inline byte& operator^=( byte& l, byte r ) noexcept`
`82`	`82`	`{`
`83`	`83`	`return l = byte( static_cast< unsigned char >( l ) ^ static_cast< unsigned char >( r ) );`
`84`	`84`	`}`