Qualify calls to bitwise_equivalent_cast() with namespace names

kjellahl · kjellahl · commit 3fffd5fd2af4 · 2018-07-17T16:13:48.000+02:00
Otherwise indirect calls from glibmm, with its own bitwise_equivalent_cast(),
can be ambiguous due to ACL (argument-dependent lookup).
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -40,6 +40,11 @@ namespace internal
  *
  * When reinterpret_cast causes a compiler warning or error, this function
  * may work. Intended mainly for conversion between different types of pointers.
+ *
+ * Qualify calls with namespace names: sigc::internal::bitwise_equivalent_cast<>().
+ * If you don't, indirect calls from another library that also contains a
+ * bitwise_equivalent_cast<>() (perhaps glibmm), can be ambiguous due to ADL
+ * (argument-dependent lookup).
  */
 template <typename out_type, typename in_type>
 inline out_type bitwise_equivalent_cast(in_type in)
@@ -153,7 +158,7 @@ struct slot_call
   /** Forms a function pointer from call_it().
    * @return A function pointer formed from call_it().
    */
-  static hook address() { return bitwise_equivalent_cast<hook>(&call_it); }
+  static hook address() { return sigc::internal::bitwise_equivalent_cast<hook>(&call_it); }
 };
 
 } /* namespace internal */
@@ -211,7 +216,7 @@ class slot<T_return(T_arg...)> : public slot_base
   inline T_return operator()(type_trait_take_t<T_arg>... a) const
   {
     if (!empty() && !blocked()) {
-      return std::invoke(internal::bitwise_equivalent_cast<call_type>(slot_base::rep_->call_), slot_base::rep_, a...);
+      return std::invoke(sigc::internal::bitwise_equivalent_cast<call_type>(slot_base::rep_->call_), slot_base::rep_, a...);
     }
 
     return T_return();
diff --git a/sigc++/signal.h b/sigc++/signal.h
@@ -322,12 +322,12 @@ struct signal_emit<T_return, void, T_arg...>
         return T_return();
       }
 
-      r_ = (bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);
+      r_ = (sigc::internal::bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);
       for (++it; it != slots.end(); ++it)
       {
         if (it->empty() || it->blocked())
           continue;
-        r_ = (bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);
+        r_ = (sigc::internal::bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);
       }
     }
 
@@ -365,7 +365,7 @@ struct signal_emit<void, void, T_arg...>
       if (slot.empty() || slot.blocked())
         continue;
 
-      (bitwise_equivalent_cast<call_type>(slot.rep_->call_))(slot.rep_, a...);
+      (sigc::internal::bitwise_equivalent_cast<call_type>(slot.rep_->call_))(slot.rep_, a...);
     }
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -322,12 +322,12 @@ struct signal_emit<T_return, void, T_arg...>`
`322`	`322`	`return T_return();`
`323`	`323`	`}`
`324`	`324`
`325`		`- r_ = (bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);`
	`325`	`+ r_ = (sigc::internal::bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);`
`326`	`326`	`for (++it; it != slots.end(); ++it)`
`327`	`327`	`{`
`328`	`328`	`if (it->empty() \|\| it->blocked())`
`329`	`329`	`continue;`
`330`		`- r_ = (bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);`
	`330`	`+ r_ = (sigc::internal::bitwise_equivalent_cast<call_type>(it->rep_->call_))(it->rep_, a...);`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
`@@ -365,7 +365,7 @@ struct signal_emit<void, void, T_arg...>`
`365`	`365`	`if (slot.empty() \|\| slot.blocked())`
`366`	`366`	`continue;`
`367`	`367`
`368`		`- (bitwise_equivalent_cast<call_type>(slot.rep_->call_))(slot.rep_, a...);`
	`368`	`+ (sigc::internal::bitwise_equivalent_cast<call_type>(slot.rep_->call_))(slot.rep_, a...);`
`369`	`369`	`}`
`370`	`370`	`}`
`371`	`371`	`};`