From fbceb5e4a2d4e7fb2f2bfa67561b7b92cde5d184 Mon Sep 17 00:00:00 2001 From: mat tso Date: Mon, 7 Mar 2016 23:22:34 +0100 Subject: [PATCH] Prepare toString support for std containers Rename projects/SelfTest/ToStringVector.cpp to ToStringContainers.cpp --- projects/CMake/CMakeLists.txt | 2 +- .../{ToStringVector.cpp => ToStringContainers.cpp} | 0 projects/SelfTest/makefile | 2 +- .../CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) rename projects/SelfTest/{ToStringVector.cpp => ToStringContainers.cpp} (100%) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 960d9fb1..63d78bd2 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -28,7 +28,7 @@ set(SOURCES ${SELF_TEST_DIR}/VariadicMacrosTests.cpp ${SELF_TEST_DIR}/EnumToString.cpp ${SELF_TEST_DIR}/ToStringPair.cpp - ${SELF_TEST_DIR}/ToStringVector.cpp + ${SELF_TEST_DIR}/ToStringContainers.cpp ${SELF_TEST_DIR}/ToStringWhich.cpp ${SELF_TEST_DIR}/ToStringTuple.cpp ) diff --git a/projects/SelfTest/ToStringVector.cpp b/projects/SelfTest/ToStringContainers.cpp similarity index 100% rename from projects/SelfTest/ToStringVector.cpp rename to projects/SelfTest/ToStringContainers.cpp diff --git a/projects/SelfTest/makefile b/projects/SelfTest/makefile index 0a29372c..ec62f329 100644 --- a/projects/SelfTest/makefile +++ b/projects/SelfTest/makefile @@ -11,7 +11,7 @@ SOURCES = ApproxTests.cpp \ VariadicMacrosTests.cpp \ EnumToString.cpp \ ToStringPair.cpp \ - ToStringVector.cpp \ + ToStringContainers.cpp \ ToStringWhich.cpp diff --git a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj index a26df536..d9066cdb 100644 --- a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj +++ b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 26059AF21BD4B94C003D575C /* PartTrackerTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26059AF11BD4B94C003D575C /* PartTrackerTests.cpp */; }; 263F7A4719B6FCBF009474C2 /* EnumToString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263F7A4619B6FCBF009474C2 /* EnumToString.cpp */; }; 263F7A4B19B6FE1E009474C2 /* ToStringPair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263F7A4819B6FE1E009474C2 /* ToStringPair.cpp */; }; - 263F7A4C19B6FE1E009474C2 /* ToStringVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263F7A4919B6FE1E009474C2 /* ToStringVector.cpp */; }; + 263F7A4C19B6FE1E009474C2 /* ToStringContainers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263F7A4919B6FE1E009474C2 /* ToStringContainers.cpp */; }; 263F7A4D19B6FE1E009474C2 /* ToStringWhich.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263F7A4A19B6FE1E009474C2 /* ToStringWhich.cpp */; }; 2656C2211925E7330040DB02 /* catch_test_spec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2656C2201925E7330040DB02 /* catch_test_spec.cpp */; }; 266B06B816F3A60A004ED264 /* VariadicMacrosTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */; }; @@ -75,7 +75,7 @@ 263F7A4519A66608009474C2 /* catch_fatal_condition.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_fatal_condition.hpp; sourceTree = ""; }; 263F7A4619B6FCBF009474C2 /* EnumToString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EnumToString.cpp; path = ../../../SelfTest/EnumToString.cpp; sourceTree = ""; }; 263F7A4819B6FE1E009474C2 /* ToStringPair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToStringPair.cpp; path = ../../../SelfTest/ToStringPair.cpp; sourceTree = ""; }; - 263F7A4919B6FE1E009474C2 /* ToStringVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToStringVector.cpp; path = ../../../SelfTest/ToStringVector.cpp; sourceTree = ""; }; + 263F7A4919B6FE1E009474C2 /* ToStringContainers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToStringContainers.cpp; path = ../../../SelfTest/ToStringContainers.cpp; sourceTree = ""; }; 263F7A4A19B6FE1E009474C2 /* ToStringWhich.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToStringWhich.cpp; path = ../../../SelfTest/ToStringWhich.cpp; sourceTree = ""; }; 263FD06017AF8DF200988A20 /* catch_timer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_timer.hpp; sourceTree = ""; }; 263FD06117AF8DF200988A20 /* catch_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_timer.h; sourceTree = ""; }; @@ -261,7 +261,7 @@ children = ( 2691574B1A532A280054F1ED /* ToStringTuple.cpp */, 263F7A4819B6FE1E009474C2 /* ToStringPair.cpp */, - 263F7A4919B6FE1E009474C2 /* ToStringVector.cpp */, + 263F7A4919B6FE1E009474C2 /* ToStringContainers.cpp */, 263F7A4A19B6FE1E009474C2 /* ToStringWhich.cpp */, 263F7A4619B6FCBF009474C2 /* EnumToString.cpp */, 266ECD73170F3C620030D735 /* BDDTests.cpp */, @@ -551,7 +551,7 @@ 26059AF21BD4B94C003D575C /* PartTrackerTests.cpp in Sources */, 263F7A4B19B6FE1E009474C2 /* ToStringPair.cpp in Sources */, 4AEE032016142F910071E950 /* catch_common.cpp in Sources */, - 263F7A4C19B6FE1E009474C2 /* ToStringVector.cpp in Sources */, + 263F7A4C19B6FE1E009474C2 /* ToStringContainers.cpp in Sources */, 4AEE032316142FC70071E950 /* catch_debugger.cpp in Sources */, 4AEE032516142FF10071E950 /* catch_stream.cpp in Sources */, 4AEE0328161434FD0071E950 /* catch_xmlwriter.cpp in Sources */,