Fix ARM compile

jkeiser · jkeiser · commit f5c8aa30d0dd · 2020-09-17T09:47:31.000-07:00
diff --git a/include/simdjson/arm64/bitmask.h b/include/simdjson/arm64/bitmask.h
@@ -33,9 +33,8 @@ simdjson_really_inline uint64_t prefix_xor(uint64_t bitmask) {
   return bitmask;
 }
 
+} // unnamed namespace
 } // namespace arm64
 } // namespace simdjson
-} // namespace simdjson
-SIMDJSON_UNTARGET_IMPLEMENTATION
 
 #endif
diff --git a/include/simdjson/arm64/simd.h b/include/simdjson/arm64/simd.h
@@ -256,6 +256,9 @@ simdjson_really_inline int8x16_t make_int8x16_t(int8_t x1,  int8_t x2,  int8_t x
     // sensible, but the AVX ISA makes this kind of approach difficult.
     template<typename L>
     simdjson_really_inline void compress(uint16_t mask, L * output) const {
+      using internal::thintable_epi8;
+      using internal::BitsSetTable256mul2;
+      using internal::pshufb_combine_table;
       // this particular implementation was inspired by work done by @animetosho
       // we do it in two steps, first 8 bytes and then second 8 bytes
       uint8_t mask1 = uint8_t(mask); // least significant 8 bits
diff --git a/include/simdjson/haswell/intrinsics.h b/include/simdjson/haswell/intrinsics.h
@@ -41,11 +41,11 @@
 // has it as a macro.
 #ifndef _blsr_u64
 // we roll our own
-SIMDJSON_TARGET_IMPLEMENTATION
+SIMDJSON_TARGET_HASWELL
 static simdjson_really_inline uint64_t _blsr_u64(uint64_t n) {
   return (n - 1) & n;
 }
-SIMDJSON_UNTARGET_IMPLEMENTATION
+SIMDJSON_UNTARGET_REGION
 #endif //  _blsr_u64
 #endif // SIMDJSON_CLANG_VISUAL_STUDIO
 

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,8 @@ simdjson_really_inline uint64_t prefix_xor(uint64_t bitmask) {`
`33`	`33`	`return bitmask;`
`34`	`34`	`}`
`35`	`35`
	`36`	`+} // unnamed namespace`
`36`	`37`	`} // namespace arm64`
`37`	`38`	`} // namespace simdjson`
`38`		`-} // namespace simdjson`
`39`		`-SIMDJSON_UNTARGET_IMPLEMENTATION`
`40`	`39`
`41`	`40`	`#endif`