fix merge error

Author: Chen, Brox

sycl/include/sycl/ext/intel/experimental/fpga_annotated_properties.hpp

@@ -17,7 +17,9 @@ namespace ext {
 namespace intel {
 namespace experimental {
 
-using namespace sycl::ext::oneapi::experimental;
+template <typename PropertyT, typename... Ts>
+using property_value =
+    sycl::ext::oneapi::experimental::property_value<PropertyT, Ts...>;
 //===----------------------------------------------------------------------===//
 //        FPGA properties of annotated_arg/annotated_ptr
 //===----------------------------------------------------------------------===//
@@ -108,7 +110,19 @@ namespace experimental {
 template <typename T, typename PropertyListT> class annotated_arg;
 template <typename T, typename PropertyListT> class annotated_ptr;
 
-using namespace sycl::ext::intel::experimental;
+struct alignment_key;
+using register_map_key = intel::experimental::register_map_key;
+using conduit_key = intel::experimental::conduit_key;
+using stable_key = intel::experimental::stable_key;
+using buffer_location_key = intel::experimental::buffer_location_key;
+using awidth_key = intel::experimental::awidth_key;
+using dwidth_key = intel::experimental::dwidth_key;
+using latency_key = intel::experimental::latency_key;
+using read_write_mode_key = intel::experimental::read_write_mode_key;
+using maxburst_key = intel::experimental::maxburst_key;
+using wait_request_key = intel::experimental::wait_request_key;
+using read_write_mode_enum = intel::experimental::read_write_mode_enum;
+
 template <> struct is_property_key<register_map_key> : std::true_type {};
 template <> struct is_property_key<conduit_key> : std::true_type {};
 template <> struct is_property_key<stable_key> : std::true_type {};

sycl/include/sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp

@@ -13,6 +13,7 @@
 
 #include <sycl/detail/stl_type_traits.hpp>
 #include <sycl/exception.hpp>
+#include <sycl/ext/intel/experimental/fpga_annotated_properties.hpp>
 #include <sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp>
 #include <sycl/ext/oneapi/properties/properties.hpp>
 

sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp

@@ -13,6 +13,7 @@
 
 #include <sycl/detail/stl_type_traits.hpp>
 #include <sycl/exception.hpp>
+#include <sycl/ext/intel/experimental/fpga_annotated_properties.hpp>
 #include <sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp>
 #include <sycl/ext/oneapi/properties/properties.hpp>
 
@@ -34,6 +35,10 @@ template <int K> inline constexpr alignment_key::value_t<K> alignment;
 
 template <> struct is_property_key<alignment_key> : std::true_type {};
 
+template <typename T, int W>
+struct is_valid_property<T, alignment_key::value_t<W>>
+    : std::bool_constant<std::is_pointer<T>::value> {};
+
 template <typename T, typename PropertyListT>
 struct is_property_key_of<alignment_key, annotated_ptr<T, PropertyListT>>
     : std::true_type {};
@@ -166,7 +171,8 @@ __SYCL_TYPE(annotated_ptr) annotated_ptr<T, detail::properties_t<Props...>> {
 
   // buffer_location and alignment are allowed for annotated_ref
   using allowed_properties =
-      std::tuple<decltype(buffer_location<0>), decltype(alignment<0>)>;
+      std::tuple<decltype(ext::intel::experimental::buffer_location<0>),
+                 decltype(ext::oneapi::experimental::alignment<0>)>;
   using filtered_properties =
       typename PropertiesFilter<allowed_properties, Props...>::tuple;