Переглянути джерело

Relocate test files to test/, header files to include/pointer/

Sam Jaffe 5 роки тому
батько
коміт
1b7ec017dd

const_propogating_ptr.hpp → include/pointer/const_propogating_ptr.hpp


const_ptr.hpp → include/pointer/const_ptr.hpp


maybe_null.hpp → include/pointer/maybe_null.hpp


not_null.hpp → include/pointer/not_null.hpp


pointer_fwd.hpp → include/pointer/pointer_fwd.hpp


ptr_compare.hpp → include/pointer/ptr_compare.hpp


value_ptr.hpp → include/pointer/value_ptr.hpp


+ 10 - 30
pointers.xcodeproj/project.pbxproj

@@ -57,17 +57,11 @@
 		CD0364691E1F3F0B003B7B84 /* const_propogating_ptr.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = const_propogating_ptr.t.h; sourceTree = "<group>"; };
 		CD03646A1E1F41DE003B7B84 /* const_ptr.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = const_ptr.t.h; sourceTree = "<group>"; };
 		CD03646B1E1F42A1003B7B84 /* value_ptr.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = value_ptr.t.h; sourceTree = "<group>"; };
-		CD125DD81E1F00C200B53FB5 /* const_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = const_ptr.hpp; sourceTree = "<group>"; };
-		CD125DDA1E1F1B7500B53FB5 /* ptr_compare.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ptr_compare.hpp; sourceTree = "<group>"; };
 		CD3DA3F21D9B42BC001B53A0 /* pointers_tc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pointers_tc; sourceTree = BUILT_PRODUCTS_DIR; };
-		CD3DA3FC1D9B42DE001B53A0 /* pointer_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pointer_fwd.hpp; sourceTree = "<group>"; };
-		CD3DA3FE1D9B42DE001B53A0 /* maybe_null.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maybe_null.hpp; sourceTree = "<group>"; };
-		CD3DA3FF1D9B42DE001B53A0 /* not_null.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = not_null.hpp; sourceTree = "<group>"; };
 		CDC3B0E31DF261D7002A415B /* not_null.t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = not_null.t.h; sourceTree = "<group>"; };
 		CDC3B0E51DF26319002A415B /* pointers_tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pointers_tc.cpp; sourceTree = "<group>"; };
 		CDC3B0E71DF263B2002A415B /* maybe_null.t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maybe_null.t.h; sourceTree = "<group>"; };
-		CDC3B0E81DF3645F002A415B /* const_propogating_ptr.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = const_propogating_ptr.hpp; sourceTree = "<group>"; };
-		CDC3B0E91DF794A6002A415B /* value_ptr.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = value_ptr.hpp; sourceTree = "<group>"; };
+		CDCB3C2F24E453E30029B771 /* pointer */ = {isa = PBXFileReference; lastKnownFileType = folder; name = pointer; path = include/pointer; sourceTree = "<group>"; };
 		CDEC1DC52351677C0091D9F2 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -92,28 +86,14 @@
 				CDC3B0E71DF263B2002A415B /* maybe_null.t.h */,
 				CDC3B0E51DF26319002A415B /* pointers_tc.cpp */,
 			);
-			name = test;
-			sourceTree = "<group>";
-		};
-		CD125DDC1E1F27E600B53FB5 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				CD3DA3FC1D9B42DE001B53A0 /* pointer_fwd.hpp */,
-				CD125DDA1E1F1B7500B53FB5 /* ptr_compare.hpp */,
-				CDC3B0E91DF794A6002A415B /* value_ptr.hpp */,
-				CD125DD81E1F00C200B53FB5 /* const_ptr.hpp */,
-				CDC3B0E81DF3645F002A415B /* const_propogating_ptr.hpp */,
-				CD3DA3FE1D9B42DE001B53A0 /* maybe_null.hpp */,
-				CD3DA3FF1D9B42DE001B53A0 /* not_null.hpp */,
-			);
-			name = src;
+			path = test;
 			sourceTree = "<group>";
 		};
 		CD3DA3E91D9B42BC001B53A0 = {
 			isa = PBXGroup;
 			children = (
 				CDEC1DC52351677C0091D9F2 /* GoogleMock.xcodeproj */,
-				CD125DDC1E1F27E600B53FB5 /* src */,
+				CDCB3C2F24E453E30029B771 /* pointer */,
 				CD125DDB1E1F27E000B53FB5 /* test */,
 				CD3DA3F31D9B42BC001B53A0 /* Products */,
 			);
@@ -235,18 +215,18 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/not_null.t.h",
-				"$(SRCROOT)/maybe_null.t.h",
-				"$(SRCROOT)/const_propogating_ptr.t.h",
-				"$(SRCROOT)/const_ptr.t.h",
-				"$(SRCROOT)/value_ptr.t.h",
+				"$(SRCROOT)/test/not_null.t.h",
+				"$(SRCROOT)/test/maybe_null.t.h",
+				"$(SRCROOT)/test/const_propogating_ptr.t.h",
+				"$(SRCROOT)/test/const_ptr.t.h",
+				"$(SRCROOT)/test/value_ptr.t.h",
 			);
 			outputPaths = (
-				"$(SRCROOT)/pointers_tc.cpp",
+				"$(SRCROOT)/test/pointers_tc.cpp",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cxxtestgen --error-printer -o pointers_tc.cpp not_null.t.h maybe_null.t.h const_propogating_ptr.t.h const_ptr.t.h value_ptr.t.h";
+			shellScript = "cxxtestgen --error-printer -o test/pointers_tc.cpp test/*.t.h\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

const_propogating_ptr.t.h → test/const_propogating_ptr.t.h


const_ptr.t.h → test/const_ptr.t.h


maybe_null.t.h → test/maybe_null.t.h


not_null.t.h → test/not_null.t.h


value_ptr.t.h → test/value_ptr.t.h