From b2978c42f6afdd917b81ac06d6d3587ee98d559e Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Mon, 19 Mar 2007 20:58:46 +0000 Subject: [PATCH] # Linux fixes This was SVN commit r4963. --- source/lib/self_test.h | 5 +---- source/test_setup.cpp | 6 ++++++ .../AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/lib/self_test.h b/source/lib/self_test.h index 7100d6ec2a..d72b7154ed 100644 --- a/source/lib/self_test.h +++ b/source/lib/self_test.h @@ -217,10 +217,7 @@ namespace CxxTest #define TS_ASSERT_STR_EQUALS(str1, str2) TS_ASSERT_EQUALS(std::string(str1), std::string(str2)) #define TS_ASSERT_WSTR_EQUALS(str1, str2) TS_ASSERT_EQUALS(std::wstring(str1), std::wstring(str2)) -static bool ts_str_contains(const std::string& str1, const std::string& str2) -{ - return str1.find(str2) != str1.npos; -} +bool ts_str_contains(const std::string& str1, const std::string& str2); // defined in test_setup.cpp #define TS_ASSERT_STR_CONTAINS(str1, str2) TS_ASSERT(ts_str_contains(str1, str2)) template diff --git a/source/test_setup.cpp b/source/test_setup.cpp index 50198aff4b..2a89581d65 100644 --- a/source/test_setup.cpp +++ b/source/test_setup.cpp @@ -45,3 +45,9 @@ class LeakReporter : public CxxTest::GlobalFixture }; static LeakReporter leakReporter; + +// Definition of function from lib/self_test.h +bool ts_str_contains(const std::string& str1, const std::string& str2) +{ + return str1.find(str2) != str1.npos; +} diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h index 8bf92223ed..925e815a2c 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h @@ -10,6 +10,7 @@ class PathListCtrl; class NodeListCtrl; +class PathSlider; class CinemaSpinnerBox; class CinemaInfoBox; class CinematicBottomBar;