Skip to content

Commit 78e6f76

Browse files
committed
#4899 Adjustments per rae's review
1 parent 40ab3b5 commit 78e6f76

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

indra/llcommon/llfile.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static void find_locking_process(const std::string& filename)
226226
}
227227
#endif // LL_WINDOWS hack to identify processes holding file open
228228

229-
static int warnif(const std::string& desc, const std::string& filename, int rc, int suppress_warning = 0)
229+
static int warnif(std::string_view desc, const std::string& filename, int rc, int suppress_warning = 0)
230230
{
231231
if (rc < 0)
232232
{
@@ -252,7 +252,7 @@ static int warnif(const std::string& desc, const std::string& filename, int rc,
252252
return rc;
253253
}
254254

255-
static int warnif(const std::string& desc, const std::string& filename, const std::error_code& ec, int suppress_warning = 0)
255+
static int warnif(std::string_view desc, const std::string& filename, const std::error_code& ec, int suppress_warning = 0)
256256
{
257257
if (ec)
258258
{
@@ -1130,11 +1130,10 @@ const std::string& LLFile::tmpdir()
11301130
temppath = std::filesystem::temp_directory_path().string();
11311131
}
11321132

1133-
char sep;
11341133
#if LL_WINDOWS
1135-
sep = '\\';
1134+
char sep = '\\';
11361135
#else
1137-
sep = '/';
1136+
char sep = '/';
11381137
#endif
11391138
if (temppath[temppath.size() - 1] != sep)
11401139
{

indra/newview/llviewerdisplay.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ std::string getProfileStatsFilename()
11441144
// base + missing 2-digit seconds, append ".json"
11451145
// post-increment sec in case we have to try again
11461146
name = stringize(base, std::setw(2), std::setfill('0'), sec++, ".json");
1147-
} while (LLFile::exists(fsyspath(name)));
1147+
} while (LLFile::exists(name));
11481148
return name;
11491149
}
11501150

0 commit comments

Comments
 (0)