• R/O
  • SSH
  • HTTPS

eirrepo: Commit


Commit MetaInfo

Revision356 (tree)
Zeit2020-10-27 08:48:31
Autorquiret

Log Message

- GCC fixes and adjustments

Ändern Zusammenfassung

Diff

--- common/sdk/DataUtil.h (revision 355)
+++ common/sdk/DataUtil.h (revision 356)
@@ -262,7 +262,7 @@
262262 AINLINE uint8_t getBitCountToByteBound( size_t bitidx )
263263 {
264264 uint8_t lastByteUsefulBitcnt = (uint8_t)( ( bitidx % 8u ) + 1 );
265-
265+
266266 return ( 8u - lastByteUsefulBitcnt );
267267 }
268268
@@ -325,7 +325,7 @@
325325
326326 moveBitsDataContainer acquisition;
327327
328- size_t dstCanCopyCount = ( dst_docopybytecnt * 8u - cpybyte_fronttrimcnt - cpybyte_backtrimcnt );
328+ size_t dstCanCopyCount = ( dst_docopybytecnt * 8u - cpybyte_fronttrimcnt - cpybyte_backtrimcnt );
329329
330330 size_t src_bitRequestCount = std::min( dstCanCopyCount, toBeCopied );
331331
@@ -380,7 +380,7 @@
380380 size_t cpybytereadcount = calcAlignedByteCount( srcbitidx, src_bitRequestCount );
381381 size_t cpybytereadidx = ( srcbitidx / 8u );
382382
383- uint64_t transform_space;
383+ uint64_t transform_space = 0;
384384 uint8_t srcbitintospace = (uint8_t)( srcbitidx - cpybytereadidx * 8u );
385385
386386 size_t actualrdbytecount = 0;
--- common/sdk/MetaHelpers.h (revision 355)
+++ common/sdk/MetaHelpers.h (revision 356)
@@ -26,13 +26,13 @@
2626 "Second template parameter needs to be of function type."); \
2727 }; \
2828 template<typename C, typename Ret, typename... Args> \
29- struct has_##checkName##<C, Ret(Args...)> { \
29+ struct has_##checkName <C, Ret(Args...)> { \
3030 private: \
3131 template<typename T> \
3232 static constexpr auto check(T*) \
3333 -> typename \
3434 std::is_same< \
35- decltype( std::declval<T>().##methName##( std::declval<Args>()... ) ), \
35+ decltype( std::declval<T>().methName( std::declval<Args>()... ) ), \
3636 Ret \
3737 >::type; \
3838 template<typename> \
--- common/sdk/Permutation.h (revision 355)
+++ common/sdk/Permutation.h (revision 356)
@@ -28,7 +28,7 @@
2828 {
2929 return 1;
3030 }
31-
31+
3232 AINLINE static numType getInputHeight( void )
3333 {
3434 return 1;
@@ -56,7 +56,7 @@
5656 {
5757 numType slx = ( x % sw );
5858 numType sly = ( y % sh );
59-
59+
6060 numType sox = ( x - slx );
6161 numType soy = ( y - sly );
6262
@@ -73,34 +73,34 @@
7373 typedef decltype(((typename std::tuple_element <0, std::tuple <permuters...>>::type*)0)->getSwizzleWidth()) wnumType;
7474 typedef decltype(((typename std::tuple_element <0, std::tuple <permuters...>>::type*)0)->getSwizzleHeight()) hnumType;
7575
76- AINLINE stackedPermuter( permuters&&... perms ) : perms( std::move( perms ) )
76+ AINLINE stackedPermuter( permuters&&... perms ) : perms( std::forward <permuters> ( perms )... )
7777 {
7878 return;
7979 }
8080
8181 AINLINE wnumType getInputWidth( void ) const
82- {
83- return std::max( perms.getInputWidth(), ... );
82+ {
83+ return std::max( std::get <permuters> ( perms ).getInputWidth()... );
8484 }
8585
8686 AINLINE hnumType getInputHeight( void ) const
8787 {
88- return std::max( perms.getInputHeight(), ... );
88+ return std::max( std::get <permuters> ( perms ).getInputHeight()... );
8989 }
9090
9191 AINLINE wnumType getOutputWidth( void ) const
9292 {
93- return std::max( perms.getOutputWidth(), ... );
93+ return std::max( std::get <permuters> ( perms ).getOutputWidth()... );
9494 }
9595
9696 AINLINE hnumType getOutputHeight( void ) const
9797 {
98- return std::max( perms.getOutputWidht(), ... );
98+ return std::max( std::get <permuters> ( perms ).getOutputHeight()... );
9999 }
100100
101101 AINLINE void permute( wnumType x, hnumType y, wnumType& tx, hnumType& ty, wnumType wcolidx, hnumType hcolidx ) const
102102 {
103- ( performLocal2DPermute( x, y, perms.getInputWidth(), perms.getInputHeight(), wcolidx, hcolidx, perms ), ... );
103+ ( performLocal2DPermute( x, y, std::get <permuters> ( perms ).getInputWidth(), std::get <permuters> ( perms ).getInputHeight(), wcolidx, hcolidx, std::get <permuters> ( perms ) ), ... );
104104
105105 tx = x;
106106 ty = y;
@@ -169,4 +169,4 @@
169169
170170 } // namespace eir
171171
172-#endif //_EIR_PERMUTATION_HEADER_
\ No newline at end of file
172+#endif //_EIR_PERMUTATION_HEADER_
Show on old repository browser