Made cross-translation units mocks available only through a feature flag.

FranckRJ · FranckRJ · commit 7116221be639 · 2026-01-23T11:49:30.000+01:00
diff --git a/.github/workflows/ci_linux_clang.yml b/.github/workflows/ci_linux_clang.yml
@@ -16,6 +16,14 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {
+            name: "Ubuntu 22.04 Clang 13 C++11 with cross-translation units mocks",
+            os: ubuntu-22.04,
+            build_type: Debug,
+            cc: "clang-13", cxx: "clang++-13",
+            cxx_standard: 11,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "Ubuntu 22.04 Clang 13",
             os: ubuntu-22.04,
@@ -88,6 +96,14 @@ jobs:
             cc: "clang-18", cxx: "clang++-18",
             cxx_standard: 26
           }
+          - {
+            name: "Ubuntu 24.04 Clang 18 C++26 with cross-translation units mocks",
+            os: ubuntu-24.04,
+            build_type: Debug,
+            cc: "clang-18", cxx: "clang++-18",
+            cxx_standard: 26,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "Ubuntu 24.04 Clang with sanitizers",
             os: ubuntu-24.04,
@@ -107,7 +123,8 @@ jobs:
             -DENABLE_TESTING=ON \
             -DWARNINGS_AS_ERRORS_FOR_TESTS=ON \
             -DOVERRIDE_CXX_STANDARD_FOR_TESTS=${{ matrix.config.cxx_standard }} \
-            -DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }}
+            -DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }} \
+            ${{ matrix.config.additional_parameters }}
           cmake --build build -j
       - name: Run tests
         run: |
diff --git a/.github/workflows/ci_linux_gcc.yml b/.github/workflows/ci_linux_gcc.yml
@@ -16,6 +16,14 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {
+            name: "Ubuntu 22.04 GCC 10 C++11 with cross-translation units mocks",
+            os: ubuntu-22.04,
+            build_type: Debug,
+            cc: "gcc-10", cxx: "g++-10",
+            cxx_standard: 11,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "Ubuntu 22.04 GCC 10",
             os: ubuntu-22.04,
@@ -82,6 +90,14 @@ jobs:
             cc: "gcc-14", cxx: "g++-14",
             cxx_standard: 26
           }
+          - {
+            name: "Ubuntu 24.04 GCC 14 C++26 with cross-translation units mocks",
+            os: ubuntu-24.04,
+            build_type: Debug,
+            cc: "gcc-14", cxx: "g++-14",
+            cxx_standard: 26,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "Ubuntu 24.04 GCC with sanitizers",
             os: ubuntu-24.04,
@@ -101,7 +117,8 @@ jobs:
             -DENABLE_TESTING=ON \
             -DWARNINGS_AS_ERRORS_FOR_TESTS=ON \
             -DOVERRIDE_CXX_STANDARD_FOR_TESTS=${{ matrix.config.cxx_standard }} \
-            -DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }}
+            -DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }} \
+            ${{ matrix.config.additional_parameters }}
           cmake --build build -j
       - name: Run tests
         run: |
diff --git a/.github/workflows/ci_macos_appleclang.yml b/.github/workflows/ci_macos_appleclang.yml
@@ -16,6 +16,13 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {
+            name: "macOS 14 AppleClang 15 C++11 with cross-translation units mocks",
+            os: macos-14,
+            build_type: Debug,
+            cxx_standard: 11,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "macOS 14 AppleClang 15 C++11",
             os: macos-14,
@@ -64,6 +71,13 @@ jobs:
             build_type: Debug,
             cxx_standard: 26
           }
+          - {
+            name: "macOS 15 AppleClang 17 C++26 with cross-translation units mocks",
+            os: macos-15,
+            build_type: Debug,
+            cxx_standard: 26,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "macOS 15 AppleClang with sanitizers",
             os: macos-15,
@@ -80,7 +94,8 @@ jobs:
             -DENABLE_TESTING=ON \
             -DWARNINGS_AS_ERRORS_FOR_TESTS=ON \
             -DOVERRIDE_CXX_STANDARD_FOR_TESTS=${{ matrix.config.cxx_standard }} \
-            -DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }}
+            -DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }} \
+            ${{ matrix.config.additional_parameters }}
           cmake --build build -j
       - name: Run tests
         run: |
diff --git a/.github/workflows/ci_windows_msvc.yml b/.github/workflows/ci_windows_msvc.yml
@@ -16,6 +16,15 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {
+            name: "Windows 2022 MSVC 2022 Win32 C++11 with cross-translation units mocks",
+            os: windows-2022,
+            build_type: Debug,
+            generator: "Visual Studio 17 2022",
+            architecture: "Win32",
+            cxx_standard: 11,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
           - {
             name: "Windows 2022 MSVC 2022 Win32",
             os: windows-2022,
@@ -126,6 +135,15 @@ jobs:
             architecture: "x64",
             cxx_standard: 26
           }
+          - {
+            name: "Windows 2025 MSVC 2022 x64 C++26 with cross-translation units mocks",
+            os: windows-2025,
+            build_type: Debug,
+            generator: "Visual Studio 17 2022",
+            architecture: "x64",
+            cxx_standard: 26,
+            additional_parameters: "-DENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS=ON"
+          }
     steps:
       - uses: actions/checkout@v3
       - name: Build project
@@ -135,7 +153,8 @@ jobs:
             -A ${{ matrix.config.architecture }} \
             -DENABLE_TESTING=ON \
             -DWARNINGS_AS_ERRORS_FOR_TESTS=ON \
-            -DOVERRIDE_CXX_STANDARD_FOR_TESTS=${{ matrix.config.cxx_standard }}
+            -DOVERRIDE_CXX_STANDARD_FOR_TESTS=${{ matrix.config.cxx_standard }} \
+            ${{ matrix.config.additional_parameters }}
           cmake --build build --config ${{ matrix.config.build_type }} -j
       - name: Run tests
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ set(OVERRIDE_CXX_STANDARD_FOR_TESTS "" CACHE STRING "Override the C++ standard u
 option(WARNINGS_AS_ERRORS_FOR_TESTS "Treat warnings as errors when building tests." OFF)
 option(ENABLE_SANITIZERS_IN_TESTS "Enable address / undefined sanitizers in tests." OFF)
 option(ENABLE_COVERAGE "Enable coverage reporting for gcc/clang." OFF)
+option(ENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS "Enable cross-translation units mocks in tests." OFF)
 
 # Directory containing main targets of FakeIt.
 add_subdirectory(include)
diff --git a/include/fakeit/api_macros.hpp b/include/fakeit/api_macros.hpp
@@ -11,8 +11,13 @@
 #define STUB_ID_STR( counter ) \
     __FILE__ COUNTER_STRINGIFY(counter)
 
-#define STUB_ID(counter) \
-    fakeit::constExprHash(STUB_ID_STR(counter))
+#ifdef FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS
+    #define STUB_ID(counter) \
+        fakeit::constExprHash(STUB_ID_STR(counter))
+#else
+    #define STUB_ID(counter) \
+        counter
+#endif
 
 #define MOCK_TYPE(mock) \
     std::remove_reference<decltype((mock).get())>::type
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -84,4 +84,9 @@ if(ENABLE_COVERAGE)
     endif()
 endif()
 
+if(ENABLE_FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS_IN_TESTS)
+    target_compile_definitions(FakeIt_tests PRIVATE FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS)
+    message(STATUS "Cross-translation units mocks enabled.")
+endif()
+
 add_test(NAME FakeIt_tests COMMAND FakeIt_tests)
diff --git a/tests/multiple_translation_units_stub_test.cpp b/tests/multiple_translation_units_stub_test.cpp
@@ -5,6 +5,7 @@
 using namespace fakeit;
 using namespace multiple_tu;
 
+#ifdef FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS
 struct MultipleTranslationUnitsStub : tpunit::TestFixture {
 
 	MultipleTranslationUnitsStub() :
@@ -126,3 +127,4 @@ struct MultipleTranslationUnitsStub : tpunit::TestFixture {
 	}
 
 } __MultipleTranslationUnitsStub;
+#endif

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using namespace fakeit;`
`6`	`6`	`using namespace multiple_tu;`
`7`	`7`
	`8`	`+#ifdef FAKEIT_CROSS_TRANSLATION_UNITS_MOCKS`
`8`	`9`	`struct MultipleTranslationUnitsStub : tpunit::TestFixture {`
`9`	`10`
`10`	`11`	`MultipleTranslationUnitsStub() :`
`@@ -126,3 +127,4 @@ struct MultipleTranslationUnitsStub : tpunit::TestFixture {`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`} __MultipleTranslationUnitsStub;`
	`130`	`+#endif`