Merge pull request #3 from libsigcplusplus/master

valtovar · web-flow · commit 6caa031a6c34 · 2018-08-22T17:12:11.000-05:00
Updating from the source repo.
diff --git a/README b/README
@@ -12,7 +12,7 @@ General information:
    depend on GTK+ or gtkmm.
 
    Further information is available on the libsigc++ project home page:
-   http://libsigc.sourceforge.net/
+   https://libsigcplusplus.github.io/libsigcplusplus/
 
 
 License information:
@@ -24,11 +24,12 @@ License information:
 Contact information:
    Maintainer: mailto: murrayc@murrayc.com
    Maillist: mailto: libsigc-list@gnome.org
-   Homepage: http://libsigc.sourceforge.net
+   Homepage: https://libsigcplusplus.github.io/libsigcplusplus/
    Online reference documentation: https://developer.gnome.org/libsigc++/unstable/
    Download: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/
              https://download.gnome.org/sources/libsigc++/
-   Git: https://git.gnome.org/browse/libsigcplusplus/
+   Git: https://github.com/libsigcplusplus/libsigcplusplus
+   Bug reports: https://github.com/libsigcplusplus/libsigcplusplus/issues
 
 
 Overview of the distribution:
@@ -51,4 +52,5 @@ Overview of the distribution:
 
 Compatibility:
 
-   Compatible compilers must support C++14, such as the decltype(auto) specifier.
+   Compatible compilers must support C++17, such as the decltype(auto) specifier
+   (from C++14) and std::invoke().
diff --git a/configure.ac b/configure.ac
@@ -16,8 +16,8 @@
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_INIT([libsigc++], [2.99.11],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=libsigc%2B%2B],
-        [libsigc++], [http://libsigc.sourceforge.net/])
+        [https://github.com/libsigcplusplus/libsigcplusplus/issues/],
+        [libsigc++], [https://libsigcplusplus.github.io/libsigcplusplus/])
 AC_PREREQ([2.59])
 
 AC_CONFIG_SRCDIR([sigc++/sigc++.h])
diff --git a/libsigcplusplus.doap b/libsigcplusplus.doap
@@ -12,8 +12,8 @@ callback function, either global or a member function, regardless of
 whether it is static or virtual.
 
 libsigc++ is also used by glibmm and gtkmm to wrap Glib and GTK+ signals.</description>
-  <homepage rdf:resource="http://libsigc.sourceforge.net/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=libsigc%2B%2B" />
+  <homepage rdf:resource="https://libsigcplusplus.github.io/libsigcplusplus/" />
+  <bug-database rdf:resource="https://github.com/libsigcplusplus/libsigcplusplus/issues/" />
   <mailing-list rdf:resource="mailto:libsigc-list@gnome.org" />
   <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
   <programming-language>C++</programming-language>
@@ -29,7 +29,7 @@ libsigc++ is also used by glibmm and gtkmm to wrap Glib and GTK+ signals.</descr
   <maintainer>
     <foaf:Person>
       <foaf:name>Kjell Ahlstedt</foaf:name>
-      <foaf:mbox rdf:resource="mailto:kjell.ahlstedt@bredband.net" />
+      <foaf:mbox rdf:resource="mailto:kjellahlstedt@gmail.com" />
       <gnome:userid>kjellahl</gnome:userid>
     </foaf:Person>
   </maintainer>
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -33,6 +33,30 @@ namespace sigc
 namespace internal
 {
 
+// Conversion between different types of function pointers with
+// reinterpret_cast can make gcc8 print a warning.
+// https://github.com/libsigcplusplus/libsigcplusplus/issues/1
+/** Returns the supplied bit pattern, interpreted as another type.
+ *
+ * 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)
+{
+  union {
+    in_type in;
+    out_type out;
+  } u;
+  u.in = in;
+  return u.out;
+}
+
 /** A typed slot_rep.
  * A typed slot_rep holds a functor that can be invoked from
  * slot::operator()(). visit_each() is used to visit the functor's
@@ -134,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 reinterpret_cast<hook>(&call_it); }
+  static hook address() { return sigc::internal::bitwise_equivalent_cast<hook>(&call_it); }
 };
 
 } /* namespace internal */
@@ -192,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(reinterpret_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_ = (reinterpret_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_ = (reinterpret_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;
 
-      (reinterpret_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_ = (reinterpret_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_ = (reinterpret_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`		`- (reinterpret_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`	`};`