Changed my mind about defaulting to compile time reduction

Author: Pierre-Antoine Lacaze

CMakeLists.txt

@@ -9,7 +9,7 @@ include(SigslotUtils)
 ### options
 option(SIGSLOT_COMPILE_EXAMPLES "Compile optional exemples" ON)
 option(SIGSLOT_COMPILE_TESTS "Compile tests" ON)
-option(SIGSLOT_DISABLE_CODE_SIZE_REDUCTION "Do not try to reduce code size and compilation time" OFF)
+option(SIGSLOT_REDUCE_COMPILE_TIME "Attempt at reducing code size and compilation time" OFF)
 
 ### sigslot library
 add_library(sigslot INTERFACE)
@@ -19,7 +19,7 @@ target_include_directories(sigslot INTERFACE
 )
 
 target_compile_definitions(sigslot INTERFACE
-    $<$<BOOL:${SIGSLOT_DISABLE_CODE_SIZE_REDUCTION}>:SIGSLOT_DISABLE_CODE_SIZE_REDUCTION>)
+    $<$<BOOL:${SIGSLOT_REDUCE_COMPILE_TIME}>:SIGSLOT_REDUCE_COMPILE_TIME>)
 set_target_properties(sigslot PROPERTIES EXPORT_NAME Sigslot)
 sigslot_set_properties(sigslot INTERFACE)
 add_library(Pal::Sigslot ALIAS sigslot)

example/lambdas.cpp

@@ -2,9 +2,9 @@
 #include <cstdio>
 
 /*
- * This example is meant to test compilation time as well as object size
- * when a lot of unique callables get connected to a signal.
- * This example motivated the introduction of a REDUCE_CODE_SIZE cmake option.
+ * This example is meant to test compilation time as well as object size when a
+ * lot of unique callables get connected to a signal.
+ * This example motivated the introduction of a SOCUTE_REDUCE_COMPILE_TIME cmake option.
  */
 
 #define LAMBDA4() sig.connect([](int) { puts("lambda\n"); });

include/sigslot/signal.hpp

@@ -212,15 +212,15 @@ T& cow_write(copy_on_write<T> &v) {
  * - Not exception safe,
  * - Allocates a separate control block, and will thus make the code slower.
  */
-#ifdef SIGSLOT_DISABLE_CODE_SIZE_REDUCTION
+#ifdef SIGSLOT_REDUCE_COMPILE_TIME
 template<typename B, typename D, typename ...Arg>
 inline std::shared_ptr<B> make_shared(Arg && ... arg) {
-    return std::static_pointer_cast<B>(std::make_shared<D>(std::forward<Arg>(arg)...));
+    return std::shared_ptr<B>(static_cast<B*>(new D(std::forward<Arg>(arg)...)));
 }
 #else
 template<typename B, typename D, typename ...Arg>
 inline std::shared_ptr<B> make_shared(Arg && ... arg) {
-    return std::shared_ptr<B>(static_cast<B*>(new D(std::forward<Arg>(arg)...)));
+    return std::static_pointer_cast<B>(std::make_shared<D>(std::forward<Arg>(arg)...));
 }
 #endif
 

readme.md

@@ -18,15 +18,15 @@ No compilation or installation is required, just include `sigslot/signal.hpp` an
 
 A CMake build file is supplied for installation purpose and generating a CMake import module. It is also required for examples and tests, which optionally depend on Qt5 and Boost for adapters unit tests.
 
-A configuration option `SIGSLOT_DISABLE_CODE_SIZE_REDUCTION` is available at configuration time.
-When activated, it disables any attempt at reducing code bloat by avoiding heavy template instantiations resulting from calls to `std::make_shared`.
-This option is off by default, but can be activated for those who with to favor code efficiency at the expanse of compilation times.
+A configuration option `SIGSLOT_REDUCE_COMPILE_TIME` is available at configuration time.
+When activated, it attempts to reduce code bloat by avoiding heavy template instantiations resulting from calls to `std::make_shared`.
+This option is off by default, but can be activated for those who with to favor code size and compilation time at the expanse of slightly less efficient code.
 
 Installation may be done using the following instructions from the root directory:
 
 ```sh
 mkdir build && cd build
-cmake .. -DSIGSLOT_DISABLE_CODE_SIZE_REDUCTION=ON -DCMAKE_INSTALL_PREFIX=~/local
+cmake .. -DSIGSLOT_REDUCE_COMPILE_TIME=ON -DCMAKE_INSTALL_PREFIX=~/local
 cmake --build . --target install
 
 # If you want to compile examples: