From 1e10bb32b92798012338bf8b44ba990b9904128d Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Mon, 31 Oct 2011 20:22:02 +0000 Subject: [PATCH] Remove global std::strings from fileutils. This is forbidden by the style guide and can cause the static initialization order fiasco. BUG= TEST=test_support_unittests Review URL: http://webrtc-codereview.appspot.com/248006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@846 4adac7df-926f-26a2-2b94-8c16560cd09d --- test/testsupport/fileutils.cc | 6 +++++- test/testsupport/fileutils.h | 10 +++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc index cc35772028..098dad7ed9 100644 --- a/test/testsupport/fileutils.cc +++ b/test/testsupport/fileutils.cc @@ -25,7 +25,11 @@ namespace webrtc { namespace test { -const std::string GetProjectRootPath() { +// The file we're looking for to identify the project root dir. +static const char* kProjectRootFileName = "DEPS"; +const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR"; + +std::string GetProjectRootPath() { char path_buffer[FILENAME_MAX]; if (!GET_CURRENT_DIR(path_buffer, sizeof(path_buffer))) { fprintf(stderr, "Cannot get current directory!\n"); diff --git a/test/testsupport/fileutils.h b/test/testsupport/fileutils.h index f59b651ab5..f6149de6e3 100644 --- a/test/testsupport/fileutils.h +++ b/test/testsupport/fileutils.h @@ -66,13 +66,9 @@ namespace webrtc { namespace test { -// The file we're looking for to identify the project root dir. -const std::string kProjectRootFileName = "DEPS"; - // This is the "directory" returned if the GetProjectPath() function fails // to find the project root. -const std::string kCannotFindProjectRootDir = - "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR"; +extern const char* kCannotFindProjectRootDir; // Finds the root dir of the project, to be able to set correct paths to // resource files used by tests. @@ -90,9 +86,9 @@ const std::string kCannotFindProjectRootDir = // WITH a trailing path delimiter. // If the project root is not found, the string specified by // kCannotFindProjectRootDir is returned. -const std::string GetProjectRootPath(); +std::string GetProjectRootPath(); -} // namespace webrtc } // namespace test +} // namespace webrtc #endif // TEST_TESTSUPPORT_FILEUTILS_H_