fix

common/string-keyed.h

@@ -325,7 +325,7 @@ class basic_map_string_kv : public M
  const_iterator end() const
  {
  auto it = base::end();
- return __reinterpret_cast<B_IT>(it);
+ return reinterpret_cast<B_IT&>(it);
  }
  iterator end()
  {
@@ -351,16 +351,10 @@ class basic_map_string_kv : public M
  {
  return find(k)->second;
  }
- template<typename T, typename P>
- T& __reinterpret_cast(P& x) const {
- static_assert(sizeof(P) == sizeof(T), "...");
- auto y = (T*)&x;
- return *y;
- }
  const_iterator find ( const key_type& k ) const
  {
  auto it = base::find((const skvm&)k);
- return __reinterpret_cast<B_IT>(it);
+ return reinterpret_cast<B_IT&>(it);
  }
  iterator find ( const key_type& k )
  {
@@ -374,8 +368,8 @@ class basic_map_string_kv : public M
  std::pair<const_iterator,const_iterator> equal_range ( const key_type& k ) const
  {
  auto r = base::equal_range((const skvm&)k);
- return {__reinterpret_cast<B_IT>(r.first),
- __reinterpret_cast<B_IT>(r.second)};
+ return {reinterpret_cast<B_IT&>(r.first),
+ reinterpret_cast<B_IT&>(r.second)};
  }
  std::pair<iterator, bool> emplace (const key_type& k, const mapped_type& v )
  {

common/utility.h

@@ -293,12 +293,6 @@ int version_compare(std::string_view a, std::string_view b, int& result);
 int kernel_version_compare(std::string_view dst, int& result);
 void print_stacktrace();
 
-template<typename T, typename P> inline
-T& __reinterpret_cast(P& x) noexcept {
- auto y = (T*)&x;
- return *y;
-}
-
 namespace photon {
 
 // Saturating addition, no upward overflow

net/test/test.cpp

@@ -576,7 +576,7 @@ bool server_down = false;
 photon::thread* server_thread = nullptr;
 
 void* serve_connection(void* arg) {
- auto fd = __reinterpret_cast<int>(arg);
+ auto fd = (int)(uint64_t)arg;
  while (true) {
  char buf[1024];
  auto ret = net::read(fd, buf, sizeof(buf));