Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhil Nash2015-08-07 17:28:48 +0100
committerPhil Nash2015-08-07 17:28:48 +0100
commitafcc38efc54e06360e778b3fbb778cf420165580 (patch)
tree257d01b63c704081f48eb1c8fbb99108f20a2bd1
parent368714e7aa09656344c8ac229963eb79e63b81ff (diff)
downloadcatch3-afcc38efc54e06360e778b3fbb778cf420165580.tar.gz
Fixes for single include
-rw-r--r--include/internal/catch_interfaces_registry_hub.h2
-rw-r--r--projects/SelfTest/MiscTests.cpp2
-rw-r--r--projects/SelfTest/TestMain.cpp2
-rw-r--r--projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout18
4 files changed, 12 insertions, 12 deletions
diff --git a/include/internal/catch_interfaces_registry_hub.h b/include/internal/catch_interfaces_registry_hub.h
index 2a420bf3..ec06ca29 100644
--- a/include/internal/catch_interfaces_registry_hub.h
+++ b/include/internal/catch_interfaces_registry_hub.h
@@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
-#include <catch_ptr.hpp>
+#include "catch_ptr.hpp"
#include <string>
diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp
index 4f92e30c..36b8a608 100644
--- a/projects/SelfTest/MiscTests.cpp
+++ b/projects/SelfTest/MiscTests.cpp
@@ -13,7 +13,7 @@
# pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
#endif
-#include "internal/catch_xmlwriter.hpp"
+#include "../include/internal/catch_xmlwriter.hpp"
#include <iostream>
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index 57e68666..f4c660d6 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -8,7 +8,7 @@
#define CATCH_CONFIG_MAIN
#include "catch.hpp"
-#include "reporters/catch_reporter_teamcity.hpp"
+#include "../include/reporters/catch_reporter_teamcity.hpp"
// Some example tag aliases
CATCH_REGISTER_TAG_ALIAS( "[@nhf]", "[failing]~[.]" )
diff --git a/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout b/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout
index fd24e72b..cce7052b 100644
--- a/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout
+++ b/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout
@@ -10,31 +10,31 @@
<string>CatchSelfTestSingle</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
- <key>01DD8CA9-7DC3-46BC-B998-EFF40EA3485F</key>
- <string>ssh://github.com/philsquared/Catch.git</string>
+ <key>90C00904F36E6ADB57A7313E998815D255B0DEAF</key>
+ <string>https://github.com/philsquared/Catch.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
- <string>projects/XCode4/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace</string>
+ <string>projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
- <key>01DD8CA9-7DC3-46BC-B998-EFF40EA3485F</key>
+ <key>90C00904F36E6ADB57A7313E998815D255B0DEAF</key>
<string>../../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
- <string>ssh://github.com/philsquared/Catch.git</string>
+ <string>https://github.com/philsquared/Catch.git</string>
<key>IDESourceControlProjectVersion</key>
- <integer>110</integer>
+ <integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
- <string>01DD8CA9-7DC3-46BC-B998-EFF40EA3485F</string>
+ <string>90C00904F36E6ADB57A7313E998815D255B0DEAF</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
- <string>01DD8CA9-7DC3-46BC-B998-EFF40EA3485F</string>
+ <string>90C00904F36E6ADB57A7313E998815D255B0DEAF</string>
<key>IDESourceControlWCCName</key>
- <string>Catch</string>
+ <string>Catch-Develop</string>
</dict>
</array>
</dict>