Skip to content

Commit a6d480b

Browse files
committed
Fix ODR violation.
1 parent ec5bd80 commit a6d480b

8 files changed

+14
-14
lines changed

SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace Kernels{
1414

1515

1616

17-
struct PartialWordMask{
17+
struct PartialWordMask_x64_AVX512{
1818
__mmask16 m;
1919

20-
PA_FORCE_INLINE PartialWordMask(size_t left)
20+
PA_FORCE_INLINE PartialWordMask_x64_AVX512(size_t left)
2121
: m(((__mmask16)1 << left) - 1)
2222
{}
2323
};
@@ -29,7 +29,7 @@ template <typename PixelTester>
2929
class FilterImage_Rgb32_x64_AVX512{
3030
public:
3131
static const size_t VECTOR_SIZE = 16;
32-
using Mask = PartialWordMask;
32+
using Mask = PartialWordMask_x64_AVX512;
3333

3434
public:
3535
FilterImage_Rgb32_x64_AVX512(
@@ -88,7 +88,7 @@ template <typename PixelTester>
8888
class ToBlackWhite_Rgb32_x64_AVX512{
8989
public:
9090
static const size_t VECTOR_SIZE = 16;
91-
using Mask = PartialWordMask;
91+
using Mask = PartialWordMask_x64_AVX512;
9292

9393
public:
9494
ToBlackWhite_Rgb32_x64_AVX512(

SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ namespace Kernels{
1515

1616

1717

18-
struct PartialWordMask{
18+
struct PartialWordMask_x64_SSE42{
1919
size_t left;
2020
PartialWordAccess_x64_SSE41 loader;
2121

22-
PA_FORCE_INLINE PartialWordMask(size_t p_left)
22+
PA_FORCE_INLINE PartialWordMask_x64_SSE42(size_t p_left)
2323
: left(p_left)
2424
, loader(left * sizeof(uint32_t))
2525
{}
@@ -33,7 +33,7 @@ template <typename PixelTester>
3333
class FilterImage_Rgb32_x64_SSE42{
3434
public:
3535
static const size_t VECTOR_SIZE = 4;
36-
using Mask = PartialWordMask;
36+
using Mask = PartialWordMask_x64_SSE42;
3737

3838
public:
3939
FilterImage_Rgb32_x64_SSE42(
@@ -104,7 +104,7 @@ template <typename PixelTester>
104104
class ToBlackWhite_Rgb32_x64_SSE42{
105105
public:
106106
static const size_t VECTOR_SIZE = 4;
107-
using Mask = PartialWordMask;
107+
using Mask = PartialWordMask_x64_SSE42;
108108

109109
public:
110110
ToBlackWhite_Rgb32_x64_SSE42(

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Kernels{
2323
class PixelTest_Rgb32Brightness_x64_AVX512VNNI{
2424
public:
2525
static const size_t VECTOR_SIZE = 16;
26-
using Mask = PartialWordMask;
26+
using Mask = PartialWordMask_x64_AVX512;
2727

2828
public:
2929
PA_FORCE_INLINE PixelTest_Rgb32Brightness_x64_AVX512VNNI(

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Kernels{
2424
class PixelTest_Rgb32Brightness_x64_SSE42{
2525
public:
2626
static const size_t VECTOR_SIZE = 4;
27-
using Mask = PartialWordMask;
27+
using Mask = PartialWordMask_x64_SSE42;
2828

2929
public:
3030
PA_FORCE_INLINE PixelTest_Rgb32Brightness_x64_SSE42(

SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Kernels{
2020
class PixelTest_Rgb32Euclidean_x64_AVX512{
2121
public:
2222
static const size_t VECTOR_SIZE = 16;
23-
using Mask = PartialWordMask;
23+
using Mask = PartialWordMask_x64_AVX512;
2424

2525
public:
2626
PA_FORCE_INLINE PixelTest_Rgb32Euclidean_x64_AVX512(

SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Kernels{
2424
class PixelTest_Rgb32Euclidean_x64_SSE42{
2525
public:
2626
static const size_t VECTOR_SIZE = 4;
27-
using Mask = PartialWordMask;
27+
using Mask = PartialWordMask_x64_SSE42;
2828

2929
public:
3030
PA_FORCE_INLINE PixelTest_Rgb32Euclidean_x64_SSE42(

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Kernels{
2525
class PixelTest_Rgb32Range_x64_AVX512{
2626
public:
2727
static const size_t VECTOR_SIZE = 16;
28-
using Mask = PartialWordMask;
28+
using Mask = PartialWordMask_x64_AVX512;
2929

3030
public:
3131
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX512(

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Kernels{
2727
class PixelTest_Rgb32Range_x64_SSE42{
2828
public:
2929
static const size_t VECTOR_SIZE = 4;
30-
using Mask = PartialWordMask;
30+
using Mask = PartialWordMask_x64_SSE42;
3131

3232
public:
3333
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_SSE42(

0 commit comments

Comments
 (0)