From 006e374d9d4cb806741c6a25505466c02f8ccc11 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 17 Mar 2016 20:49:33 +0300 Subject: [PATCH] Split unit set project to intrusive and non-intrusive ones --- projects/Win/vc14/cds.sln | 15 + projects/Win/vc14/gtest-intrusive-set.vcxproj | 417 ++++++++++++++++++ .../vc14/gtest-intrusive-set.vcxproj.filters | 216 +++++++++ projects/Win/vc14/gtest-set.vcxproj | 203 +-------- projects/Win/vc14/gtest-set.vcxproj.filters | 216 +-------- test/unit/CMakeLists.txt | 1 + .../{set => intrusive-set}/CMakeLists.txt | 2 +- .../intrusive_feldman_hashset_dhp.cpp | 0 .../intrusive_feldman_hashset_hp.cpp | 0 .../intrusive_feldman_hashset_rcu_gpb.cpp | 0 .../intrusive_feldman_hashset_rcu_gpi.cpp | 0 .../intrusive_feldman_hashset_rcu_gpt.cpp | 0 .../intrusive_feldman_hashset_rcu_shb.cpp | 0 .../intrusive_feldman_hashset_rcu_sht.cpp | 0 .../intrusive_michael_lazy_dhp.cpp | 0 .../intrusive_michael_lazy_hp.cpp | 0 .../intrusive_michael_lazy_nogc.cpp | 0 .../intrusive_michael_lazy_rcu_gpb.cpp | 0 .../intrusive_michael_lazy_rcu_gpi.cpp | 0 .../intrusive_michael_lazy_rcu_gpt.cpp | 0 .../intrusive_michael_lazy_rcu_shb.cpp | 0 .../intrusive_michael_lazy_rcu_sht.cpp | 0 .../intrusive_michael_michael_dhp.cpp | 0 .../intrusive_michael_michael_hp.cpp | 0 .../intrusive_michael_michael_nogc.cpp | 0 .../intrusive_michael_michael_rcu_gpb.cpp | 0 .../intrusive_michael_michael_rcu_gpi.cpp | 0 .../intrusive_michael_michael_rcu_gpt.cpp | 0 .../intrusive_michael_michael_rcu_shb.cpp | 0 .../intrusive_michael_michael_rcu_sht.cpp | 0 .../intrusive_skiplist_dhp.cpp | 0 .../intrusive_skiplist_hp.cpp | 0 .../intrusive_skiplist_nogc.cpp | 0 .../intrusive_skiplist_rcu_gpb.cpp | 0 .../intrusive_skiplist_rcu_gpi.cpp | 0 .../intrusive_skiplist_rcu_gpt.cpp | 0 .../intrusive_skiplist_rcu_shb.cpp | 0 .../intrusive_skiplist_rcu_sht.cpp | 0 .../intrusive_split_lazy_dhp.cpp | 0 .../intrusive_split_lazy_hp.cpp | 0 .../intrusive_split_lazy_nogc.cpp | 0 .../intrusive_split_lazy_rcu_gpb.cpp | 0 .../intrusive_split_lazy_rcu_gpi.cpp | 0 .../intrusive_split_lazy_rcu_gpt.cpp | 0 .../intrusive_split_lazy_rcu_shb.cpp | 0 .../intrusive_split_lazy_rcu_sht.cpp | 0 .../intrusive_split_michael_dhp.cpp | 0 .../intrusive_split_michael_hp.cpp | 0 .../intrusive_split_michael_nogc.cpp | 0 .../intrusive_split_michael_rcu_gpb.cpp | 0 .../intrusive_split_michael_rcu_gpi.cpp | 0 .../intrusive_split_michael_rcu_gpt.cpp | 0 .../intrusive_split_michael_rcu_shb.cpp | 0 .../intrusive_split_michael_rcu_sht.cpp | 0 .../michael_michael_dhp.cpp | 0 .../michael_michael_hp.cpp | 0 .../michael_michael_nogc.cpp | 0 .../michael_michael_rcu_gpb.cpp | 0 .../michael_michael_rcu_gpi.cpp | 0 .../michael_michael_rcu_gpt.cpp | 0 .../michael_michael_rcu_shb.cpp | 0 .../michael_michael_rcu_sht.cpp | 0 .../test_intrusive_feldman_hashset.h | 0 .../test_intrusive_feldman_hashset_hp.h | 0 .../test_intrusive_feldman_hashset_rcu.h | 0 .../test_intrusive_michael_lazy_rcu.h | 0 .../test_intrusive_michael_michael_rcu.h | 0 .../test_intrusive_set.h | 0 .../test_intrusive_set_hp.h | 0 .../test_intrusive_set_nogc.h | 0 .../test_intrusive_set_rcu.h | 0 .../test_intrusive_skiplist_rcu.h | 0 .../test_intrusive_split_lazy_rcu.h | 0 .../test_intrusive_split_michael_rcu.h | 0 .../test_michael_michael_rcu.h | 0 test/unit/{set => intrusive-set}/test_set.h | 0 .../unit/{set => intrusive-set}/test_set_hp.h | 0 .../{set => intrusive-set}/test_set_nogc.h | 0 .../{set => intrusive-set}/test_set_rcu.h | 0 79 files changed, 674 insertions(+), 396 deletions(-) create mode 100644 projects/Win/vc14/gtest-intrusive-set.vcxproj create mode 100644 projects/Win/vc14/gtest-intrusive-set.vcxproj.filters rename test/unit/{set => intrusive-set}/CMakeLists.txt (97%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_hp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_feldman_hashset_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_hp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_nogc.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_lazy_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_hp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_nogc.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_michael_michael_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_hp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_nogc.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_skiplist_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_hp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_nogc.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_lazy_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_hp.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_nogc.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/intrusive_split_michael_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_dhp.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_hp.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_nogc.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_rcu_gpb.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_rcu_gpi.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_rcu_gpt.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_rcu_shb.cpp (100%) rename test/unit/{set => intrusive-set}/michael_michael_rcu_sht.cpp (100%) rename test/unit/{set => intrusive-set}/test_intrusive_feldman_hashset.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_feldman_hashset_hp.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_feldman_hashset_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_michael_lazy_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_michael_michael_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_set.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_set_hp.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_set_nogc.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_set_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_skiplist_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_split_lazy_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_intrusive_split_michael_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_michael_michael_rcu.h (100%) rename test/unit/{set => intrusive-set}/test_set.h (100%) rename test/unit/{set => intrusive-set}/test_set_hp.h (100%) rename test/unit/{set => intrusive-set}/test_set_nogc.h (100%) rename test/unit/{set => intrusive-set}/test_set_rcu.h (100%) diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln index a21acd60..e201294d 100644 --- a/projects/Win/vc14/cds.sln +++ b/projects/Win/vc14/cds.sln @@ -210,6 +210,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-set", "gtest-set.vcxp {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-intrusive-set", "gtest-intrusive-set.vcxproj", "{EC1EF263-7E34-4867-9ED9-77AA7963CD4A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -532,6 +534,18 @@ Global {A589D3F1-A749-4268-ADEC-D0CE13D1E359}.Release|Win32.Build.0 = Release|Win32 {A589D3F1-A749-4268-ADEC-D0CE13D1E359}.Release|x64.ActiveCfg = Release|x64 {A589D3F1-A749-4268-ADEC-D0CE13D1E359}.Release|x64.Build.0 = Release|x64 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Debug|Win32.ActiveCfg = Debug|Win32 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Debug|Win32.Build.0 = Debug|Win32 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Debug|x64.ActiveCfg = Debug|x64 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Debug|x64.Build.0 = Debug|x64 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Release|Win32.ActiveCfg = Release|Win32 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Release|Win32.Build.0 = Release|Win32 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Release|x64.ActiveCfg = Release|x64 + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -564,6 +578,7 @@ Global {50B2EC4B-A118-4E7B-ABC7-2EA8B685A58C} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} {51AC349E-B365-4FCF-8778-17A1534E4584} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} {A589D3F1-A749-4268-ADEC-D0CE13D1E359} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A} = {810490B7-31E5-49AE-8455-CAF99A9658B6} EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} diff --git a/projects/Win/vc14/gtest-intrusive-set.vcxproj b/projects/Win/vc14/gtest-intrusive-set.vcxproj new file mode 100644 index 00000000..ab777d22 --- /dev/null +++ b/projects/Win/vc14/gtest-intrusive-set.vcxproj @@ -0,0 +1,417 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + + + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + + + + + + + + + + + + + + + + + + + + + {EC1EF263-7E34-4867-9ED9-77AA7963CD4A} + Win32Proj + intrusive_set + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + Console + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + Console + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + Console + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + Console + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-intrusive-set.vcxproj.filters b/projects/Win/vc14/gtest-intrusive-set.vcxproj.filters new file mode 100644 index 00000000..b1946eca --- /dev/null +++ b/projects/Win/vc14/gtest-intrusive-set.vcxproj.filters @@ -0,0 +1,216 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {9f3cc5d8-7142-4a8e-a520-512911312b13} + + + {9c07e86e-bd5b-4ae1-a730-c768234ba9f0} + + + {852d2603-551b-460b-b17f-f370d91f79e7} + + + {619a4db2-c9a0-44eb-bbcf-842ed42d4172} + + + + + Source Files + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\MichaelSet + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SplitList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\SkipList + + + Source Files\FeldmanHashSet + + + Source Files\FeldmanHashSet + + + Source Files\FeldmanHashSet + + + Source Files\FeldmanHashSet + + + Source Files\FeldmanHashSet + + + Source Files\FeldmanHashSet + + + Source Files\FeldmanHashSet + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-set.vcxproj b/projects/Win/vc14/gtest-set.vcxproj index ff2d3cba..c7bdd9a9 100644 --- a/projects/Win/vc14/gtest-set.vcxproj +++ b/projects/Win/vc14/gtest-set.vcxproj @@ -28,17 +28,10 @@ - - - - - - - - - - - + + + + 4503 4503 4503 @@ -46,8 +39,8 @@ 4503 4503 - - + + 4503 4503 4503 @@ -55,186 +48,14 @@ 4503 4503 - - - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - - - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - + + - - - - - - - - - - - - - - - - - + + + + {A589D3F1-A749-4268-ADEC-D0CE13D1E359} diff --git a/projects/Win/vc14/gtest-set.vcxproj.filters b/projects/Win/vc14/gtest-set.vcxproj.filters index f968bd71..258217f1 100644 --- a/projects/Win/vc14/gtest-set.vcxproj.filters +++ b/projects/Win/vc14/gtest-set.vcxproj.filters @@ -13,18 +13,6 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - {9f3cc5d8-7142-4a8e-a520-512911312b13} - - - {619a4db2-c9a0-44eb-bbcf-842ed42d4172} - - - {9c07e86e-bd5b-4ae1-a730-c768234ba9f0} - - - {852d2603-551b-460b-b17f-f370d91f79e7} - {4c75be9d-6104-435d-b08f-09fa33b2bfcc} @@ -33,222 +21,42 @@ Source Files - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrsive:MichaelSet - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive:SplitList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive::SkipList - - - Source Files\intrusive:FeldmanHashSet - - - Source Files\intrusive:FeldmanHashSet - - - Source Files\intrusive:FeldmanHashSet - - - Source Files\intrusive:FeldmanHashSet - - - Source Files\intrusive:FeldmanHashSet - - - Source Files\intrusive:FeldmanHashSet - - - Source Files\intrusive:FeldmanHashSet - - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 8be50916..fb88bf81 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -2,5 +2,6 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deque) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/list) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/pqueue) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/queue) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/intrusive-set) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/set) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/stack) diff --git a/test/unit/set/CMakeLists.txt b/test/unit/intrusive-set/CMakeLists.txt similarity index 97% rename from test/unit/set/CMakeLists.txt rename to test/unit/intrusive-set/CMakeLists.txt index bfc7c455..c01513ef 100644 --- a/test/unit/set/CMakeLists.txt +++ b/test/unit/intrusive-set/CMakeLists.txt @@ -1,4 +1,4 @@ -set(PACKAGE_NAME unit-set) +set(PACKAGE_NAME unit-intrusive-set) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof") diff --git a/test/unit/set/intrusive_feldman_hashset_dhp.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_dhp.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_dhp.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_dhp.cpp diff --git a/test/unit/set/intrusive_feldman_hashset_hp.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_hp.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_hp.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_hp.cpp diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_gpb.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_rcu_gpb.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_rcu_gpb.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_rcu_gpb.cpp diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_gpi.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_rcu_gpi.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_rcu_gpi.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_rcu_gpi.cpp diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_gpt.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_rcu_gpt.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_rcu_gpt.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_rcu_gpt.cpp diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_shb.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_rcu_shb.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_rcu_shb.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_rcu_shb.cpp diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_sht.cpp b/test/unit/intrusive-set/intrusive_feldman_hashset_rcu_sht.cpp similarity index 100% rename from test/unit/set/intrusive_feldman_hashset_rcu_sht.cpp rename to test/unit/intrusive-set/intrusive_feldman_hashset_rcu_sht.cpp diff --git a/test/unit/set/intrusive_michael_lazy_dhp.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_dhp.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_dhp.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_dhp.cpp diff --git a/test/unit/set/intrusive_michael_lazy_hp.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_hp.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_hp.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_hp.cpp diff --git a/test/unit/set/intrusive_michael_lazy_nogc.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_nogc.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_nogc.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_nogc.cpp diff --git a/test/unit/set/intrusive_michael_lazy_rcu_gpb.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_rcu_gpb.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_rcu_gpb.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_rcu_gpb.cpp diff --git a/test/unit/set/intrusive_michael_lazy_rcu_gpi.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_rcu_gpi.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_rcu_gpi.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_rcu_gpi.cpp diff --git a/test/unit/set/intrusive_michael_lazy_rcu_gpt.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_rcu_gpt.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_rcu_gpt.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_rcu_gpt.cpp diff --git a/test/unit/set/intrusive_michael_lazy_rcu_shb.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_rcu_shb.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_rcu_shb.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_rcu_shb.cpp diff --git a/test/unit/set/intrusive_michael_lazy_rcu_sht.cpp b/test/unit/intrusive-set/intrusive_michael_lazy_rcu_sht.cpp similarity index 100% rename from test/unit/set/intrusive_michael_lazy_rcu_sht.cpp rename to test/unit/intrusive-set/intrusive_michael_lazy_rcu_sht.cpp diff --git a/test/unit/set/intrusive_michael_michael_dhp.cpp b/test/unit/intrusive-set/intrusive_michael_michael_dhp.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_dhp.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_dhp.cpp diff --git a/test/unit/set/intrusive_michael_michael_hp.cpp b/test/unit/intrusive-set/intrusive_michael_michael_hp.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_hp.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_hp.cpp diff --git a/test/unit/set/intrusive_michael_michael_nogc.cpp b/test/unit/intrusive-set/intrusive_michael_michael_nogc.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_nogc.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_nogc.cpp diff --git a/test/unit/set/intrusive_michael_michael_rcu_gpb.cpp b/test/unit/intrusive-set/intrusive_michael_michael_rcu_gpb.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_rcu_gpb.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_rcu_gpb.cpp diff --git a/test/unit/set/intrusive_michael_michael_rcu_gpi.cpp b/test/unit/intrusive-set/intrusive_michael_michael_rcu_gpi.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_rcu_gpi.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_rcu_gpi.cpp diff --git a/test/unit/set/intrusive_michael_michael_rcu_gpt.cpp b/test/unit/intrusive-set/intrusive_michael_michael_rcu_gpt.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_rcu_gpt.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_rcu_gpt.cpp diff --git a/test/unit/set/intrusive_michael_michael_rcu_shb.cpp b/test/unit/intrusive-set/intrusive_michael_michael_rcu_shb.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_rcu_shb.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_rcu_shb.cpp diff --git a/test/unit/set/intrusive_michael_michael_rcu_sht.cpp b/test/unit/intrusive-set/intrusive_michael_michael_rcu_sht.cpp similarity index 100% rename from test/unit/set/intrusive_michael_michael_rcu_sht.cpp rename to test/unit/intrusive-set/intrusive_michael_michael_rcu_sht.cpp diff --git a/test/unit/set/intrusive_skiplist_dhp.cpp b/test/unit/intrusive-set/intrusive_skiplist_dhp.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_dhp.cpp rename to test/unit/intrusive-set/intrusive_skiplist_dhp.cpp diff --git a/test/unit/set/intrusive_skiplist_hp.cpp b/test/unit/intrusive-set/intrusive_skiplist_hp.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_hp.cpp rename to test/unit/intrusive-set/intrusive_skiplist_hp.cpp diff --git a/test/unit/set/intrusive_skiplist_nogc.cpp b/test/unit/intrusive-set/intrusive_skiplist_nogc.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_nogc.cpp rename to test/unit/intrusive-set/intrusive_skiplist_nogc.cpp diff --git a/test/unit/set/intrusive_skiplist_rcu_gpb.cpp b/test/unit/intrusive-set/intrusive_skiplist_rcu_gpb.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_rcu_gpb.cpp rename to test/unit/intrusive-set/intrusive_skiplist_rcu_gpb.cpp diff --git a/test/unit/set/intrusive_skiplist_rcu_gpi.cpp b/test/unit/intrusive-set/intrusive_skiplist_rcu_gpi.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_rcu_gpi.cpp rename to test/unit/intrusive-set/intrusive_skiplist_rcu_gpi.cpp diff --git a/test/unit/set/intrusive_skiplist_rcu_gpt.cpp b/test/unit/intrusive-set/intrusive_skiplist_rcu_gpt.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_rcu_gpt.cpp rename to test/unit/intrusive-set/intrusive_skiplist_rcu_gpt.cpp diff --git a/test/unit/set/intrusive_skiplist_rcu_shb.cpp b/test/unit/intrusive-set/intrusive_skiplist_rcu_shb.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_rcu_shb.cpp rename to test/unit/intrusive-set/intrusive_skiplist_rcu_shb.cpp diff --git a/test/unit/set/intrusive_skiplist_rcu_sht.cpp b/test/unit/intrusive-set/intrusive_skiplist_rcu_sht.cpp similarity index 100% rename from test/unit/set/intrusive_skiplist_rcu_sht.cpp rename to test/unit/intrusive-set/intrusive_skiplist_rcu_sht.cpp diff --git a/test/unit/set/intrusive_split_lazy_dhp.cpp b/test/unit/intrusive-set/intrusive_split_lazy_dhp.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_dhp.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_dhp.cpp diff --git a/test/unit/set/intrusive_split_lazy_hp.cpp b/test/unit/intrusive-set/intrusive_split_lazy_hp.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_hp.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_hp.cpp diff --git a/test/unit/set/intrusive_split_lazy_nogc.cpp b/test/unit/intrusive-set/intrusive_split_lazy_nogc.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_nogc.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_nogc.cpp diff --git a/test/unit/set/intrusive_split_lazy_rcu_gpb.cpp b/test/unit/intrusive-set/intrusive_split_lazy_rcu_gpb.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_rcu_gpb.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_rcu_gpb.cpp diff --git a/test/unit/set/intrusive_split_lazy_rcu_gpi.cpp b/test/unit/intrusive-set/intrusive_split_lazy_rcu_gpi.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_rcu_gpi.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_rcu_gpi.cpp diff --git a/test/unit/set/intrusive_split_lazy_rcu_gpt.cpp b/test/unit/intrusive-set/intrusive_split_lazy_rcu_gpt.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_rcu_gpt.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_rcu_gpt.cpp diff --git a/test/unit/set/intrusive_split_lazy_rcu_shb.cpp b/test/unit/intrusive-set/intrusive_split_lazy_rcu_shb.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_rcu_shb.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_rcu_shb.cpp diff --git a/test/unit/set/intrusive_split_lazy_rcu_sht.cpp b/test/unit/intrusive-set/intrusive_split_lazy_rcu_sht.cpp similarity index 100% rename from test/unit/set/intrusive_split_lazy_rcu_sht.cpp rename to test/unit/intrusive-set/intrusive_split_lazy_rcu_sht.cpp diff --git a/test/unit/set/intrusive_split_michael_dhp.cpp b/test/unit/intrusive-set/intrusive_split_michael_dhp.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_dhp.cpp rename to test/unit/intrusive-set/intrusive_split_michael_dhp.cpp diff --git a/test/unit/set/intrusive_split_michael_hp.cpp b/test/unit/intrusive-set/intrusive_split_michael_hp.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_hp.cpp rename to test/unit/intrusive-set/intrusive_split_michael_hp.cpp diff --git a/test/unit/set/intrusive_split_michael_nogc.cpp b/test/unit/intrusive-set/intrusive_split_michael_nogc.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_nogc.cpp rename to test/unit/intrusive-set/intrusive_split_michael_nogc.cpp diff --git a/test/unit/set/intrusive_split_michael_rcu_gpb.cpp b/test/unit/intrusive-set/intrusive_split_michael_rcu_gpb.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_rcu_gpb.cpp rename to test/unit/intrusive-set/intrusive_split_michael_rcu_gpb.cpp diff --git a/test/unit/set/intrusive_split_michael_rcu_gpi.cpp b/test/unit/intrusive-set/intrusive_split_michael_rcu_gpi.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_rcu_gpi.cpp rename to test/unit/intrusive-set/intrusive_split_michael_rcu_gpi.cpp diff --git a/test/unit/set/intrusive_split_michael_rcu_gpt.cpp b/test/unit/intrusive-set/intrusive_split_michael_rcu_gpt.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_rcu_gpt.cpp rename to test/unit/intrusive-set/intrusive_split_michael_rcu_gpt.cpp diff --git a/test/unit/set/intrusive_split_michael_rcu_shb.cpp b/test/unit/intrusive-set/intrusive_split_michael_rcu_shb.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_rcu_shb.cpp rename to test/unit/intrusive-set/intrusive_split_michael_rcu_shb.cpp diff --git a/test/unit/set/intrusive_split_michael_rcu_sht.cpp b/test/unit/intrusive-set/intrusive_split_michael_rcu_sht.cpp similarity index 100% rename from test/unit/set/intrusive_split_michael_rcu_sht.cpp rename to test/unit/intrusive-set/intrusive_split_michael_rcu_sht.cpp diff --git a/test/unit/set/michael_michael_dhp.cpp b/test/unit/intrusive-set/michael_michael_dhp.cpp similarity index 100% rename from test/unit/set/michael_michael_dhp.cpp rename to test/unit/intrusive-set/michael_michael_dhp.cpp diff --git a/test/unit/set/michael_michael_hp.cpp b/test/unit/intrusive-set/michael_michael_hp.cpp similarity index 100% rename from test/unit/set/michael_michael_hp.cpp rename to test/unit/intrusive-set/michael_michael_hp.cpp diff --git a/test/unit/set/michael_michael_nogc.cpp b/test/unit/intrusive-set/michael_michael_nogc.cpp similarity index 100% rename from test/unit/set/michael_michael_nogc.cpp rename to test/unit/intrusive-set/michael_michael_nogc.cpp diff --git a/test/unit/set/michael_michael_rcu_gpb.cpp b/test/unit/intrusive-set/michael_michael_rcu_gpb.cpp similarity index 100% rename from test/unit/set/michael_michael_rcu_gpb.cpp rename to test/unit/intrusive-set/michael_michael_rcu_gpb.cpp diff --git a/test/unit/set/michael_michael_rcu_gpi.cpp b/test/unit/intrusive-set/michael_michael_rcu_gpi.cpp similarity index 100% rename from test/unit/set/michael_michael_rcu_gpi.cpp rename to test/unit/intrusive-set/michael_michael_rcu_gpi.cpp diff --git a/test/unit/set/michael_michael_rcu_gpt.cpp b/test/unit/intrusive-set/michael_michael_rcu_gpt.cpp similarity index 100% rename from test/unit/set/michael_michael_rcu_gpt.cpp rename to test/unit/intrusive-set/michael_michael_rcu_gpt.cpp diff --git a/test/unit/set/michael_michael_rcu_shb.cpp b/test/unit/intrusive-set/michael_michael_rcu_shb.cpp similarity index 100% rename from test/unit/set/michael_michael_rcu_shb.cpp rename to test/unit/intrusive-set/michael_michael_rcu_shb.cpp diff --git a/test/unit/set/michael_michael_rcu_sht.cpp b/test/unit/intrusive-set/michael_michael_rcu_sht.cpp similarity index 100% rename from test/unit/set/michael_michael_rcu_sht.cpp rename to test/unit/intrusive-set/michael_michael_rcu_sht.cpp diff --git a/test/unit/set/test_intrusive_feldman_hashset.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h similarity index 100% rename from test/unit/set/test_intrusive_feldman_hashset.h rename to test/unit/intrusive-set/test_intrusive_feldman_hashset.h diff --git a/test/unit/set/test_intrusive_feldman_hashset_hp.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset_hp.h similarity index 100% rename from test/unit/set/test_intrusive_feldman_hashset_hp.h rename to test/unit/intrusive-set/test_intrusive_feldman_hashset_hp.h diff --git a/test/unit/set/test_intrusive_feldman_hashset_rcu.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_feldman_hashset_rcu.h rename to test/unit/intrusive-set/test_intrusive_feldman_hashset_rcu.h diff --git a/test/unit/set/test_intrusive_michael_lazy_rcu.h b/test/unit/intrusive-set/test_intrusive_michael_lazy_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_michael_lazy_rcu.h rename to test/unit/intrusive-set/test_intrusive_michael_lazy_rcu.h diff --git a/test/unit/set/test_intrusive_michael_michael_rcu.h b/test/unit/intrusive-set/test_intrusive_michael_michael_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_michael_michael_rcu.h rename to test/unit/intrusive-set/test_intrusive_michael_michael_rcu.h diff --git a/test/unit/set/test_intrusive_set.h b/test/unit/intrusive-set/test_intrusive_set.h similarity index 100% rename from test/unit/set/test_intrusive_set.h rename to test/unit/intrusive-set/test_intrusive_set.h diff --git a/test/unit/set/test_intrusive_set_hp.h b/test/unit/intrusive-set/test_intrusive_set_hp.h similarity index 100% rename from test/unit/set/test_intrusive_set_hp.h rename to test/unit/intrusive-set/test_intrusive_set_hp.h diff --git a/test/unit/set/test_intrusive_set_nogc.h b/test/unit/intrusive-set/test_intrusive_set_nogc.h similarity index 100% rename from test/unit/set/test_intrusive_set_nogc.h rename to test/unit/intrusive-set/test_intrusive_set_nogc.h diff --git a/test/unit/set/test_intrusive_set_rcu.h b/test/unit/intrusive-set/test_intrusive_set_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_set_rcu.h rename to test/unit/intrusive-set/test_intrusive_set_rcu.h diff --git a/test/unit/set/test_intrusive_skiplist_rcu.h b/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_skiplist_rcu.h rename to test/unit/intrusive-set/test_intrusive_skiplist_rcu.h diff --git a/test/unit/set/test_intrusive_split_lazy_rcu.h b/test/unit/intrusive-set/test_intrusive_split_lazy_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_split_lazy_rcu.h rename to test/unit/intrusive-set/test_intrusive_split_lazy_rcu.h diff --git a/test/unit/set/test_intrusive_split_michael_rcu.h b/test/unit/intrusive-set/test_intrusive_split_michael_rcu.h similarity index 100% rename from test/unit/set/test_intrusive_split_michael_rcu.h rename to test/unit/intrusive-set/test_intrusive_split_michael_rcu.h diff --git a/test/unit/set/test_michael_michael_rcu.h b/test/unit/intrusive-set/test_michael_michael_rcu.h similarity index 100% rename from test/unit/set/test_michael_michael_rcu.h rename to test/unit/intrusive-set/test_michael_michael_rcu.h diff --git a/test/unit/set/test_set.h b/test/unit/intrusive-set/test_set.h similarity index 100% rename from test/unit/set/test_set.h rename to test/unit/intrusive-set/test_set.h diff --git a/test/unit/set/test_set_hp.h b/test/unit/intrusive-set/test_set_hp.h similarity index 100% rename from test/unit/set/test_set_hp.h rename to test/unit/intrusive-set/test_set_hp.h diff --git a/test/unit/set/test_set_nogc.h b/test/unit/intrusive-set/test_set_nogc.h similarity index 100% rename from test/unit/set/test_set_nogc.h rename to test/unit/intrusive-set/test_set_nogc.h diff --git a/test/unit/set/test_set_rcu.h b/test/unit/intrusive-set/test_set_rcu.h similarity index 100% rename from test/unit/set/test_set_rcu.h rename to test/unit/intrusive-set/test_set_rcu.h -- 2.34.1