townforge/filesystem
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #11288 A patch to avoid redundant string allocations

Browse Source
This commit is contained in:
Beman 2015-08-30 16:44:27 -04:00
parent 810f40becf
commit 2b019a8483
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/operations.cpp
View File

@ -263,8 +263,8 @@ namespace
// error handling helpers ----------------------------------------------------------//
bool error(err_t error_num, error_code* ec, const string& message);
bool error(err_t error_num, const path& p, error_code* ec, const string& message);
bool error(err_t error_num, error_code* ec, const char* message);
bool error(err_t error_num, const path& p, error_code* ec, const char* message);
bool error(err_t error_num, const path& p1, const path& p2, error_code* ec,
const string& message);
@ -274,7 +274,7 @@ namespace
// Interface changed 30 Jan 15 to have caller supply error_num as ::SetLastError()
// values were apparently getting cleared before they could be retrieved by error().
bool error(err_t error_num, error_code* ec, const string& message)
bool error(err_t error_num, error_code* ec, const char* message)
{
if (!error_num)
{
@ -291,7 +291,7 @@ namespace
return error_num != 0;
}
bool error(err_t error_num, const path& p, error_code* ec, const string& message)
bool error(err_t error_num, const path& p, error_code* ec, const char* message)
{
if (!error_num)
{
@ -309,7 +309,7 @@ namespace
}
bool error(err_t error_num, const path& p1, const path& p2, error_code* ec,
const string& message)
const char* message)
{
if (!error_num)
{

10
test/msvc/filesystem.sln
View File

@ -279,10 +279,8 @@ Global
{36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}.Release|Win32.Build.0 = Release|Win32
{36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}.Release|x64.ActiveCfg = Release|Win32
{3AB1E2A1-9616-4E91-83F4-1D7A33A586DE}.Debug|Win32.ActiveCfg = Debug|Win32
{3AB1E2A1-9616-4E91-83F4-1D7A33A586DE}.Debug|Win32.Build.0 = Debug|Win32
{3AB1E2A1-9616-4E91-83F4-1D7A33A586DE}.Debug|x64.ActiveCfg = Debug|Win32
{3AB1E2A1-9616-4E91-83F4-1D7A33A586DE}.Release|Win32.ActiveCfg = Release|Win32
{3AB1E2A1-9616-4E91-83F4-1D7A33A586DE}.Release|Win32.Build.0 = Release|Win32
{3AB1E2A1-9616-4E91-83F4-1D7A33A586DE}.Release|x64.ActiveCfg = Release|Win32
{C6594EC2-1BDA-41A1-B2C0-7FB8AE713CF8}.Debug|Win32.ActiveCfg = Debug|Win32
{C6594EC2-1BDA-41A1-B2C0-7FB8AE713CF8}.Debug|Win32.Build.0 = Debug|Win32
@ -303,29 +301,21 @@ Global
{3D74D9C5-31B1-4D5B-B49C-8725E26CF768}.Release|Win32.Build.0 = Release|Win32
{3D74D9C5-31B1-4D5B-B49C-8725E26CF768}.Release|x64.ActiveCfg = Release|Win32
{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Debug|Win32.ActiveCfg = Debug|Win32
{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Debug|Win32.Build.0 = Debug|Win32
{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Debug|x64.ActiveCfg = Debug|Win32
{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Release|Win32.ActiveCfg = Release|Win32
{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Release|Win32.Build.0 = Release|Win32
{3B1AF12C-25AB-44F7-A80B-8BBA0D3D08CE}.Release|x64.ActiveCfg = Release|Win32
{5FFA4555-E967-4632-A3E6-ED8826E9FDED}.Debug|Win32.ActiveCfg = Debug|Win32
{5FFA4555-E967-4632-A3E6-ED8826E9FDED}.Debug|x64.ActiveCfg = Debug|Win32
{5FFA4555-E967-4632-A3E6-ED8826E9FDED}.Release|Win32.ActiveCfg = Release|Win32
{5FFA4555-E967-4632-A3E6-ED8826E9FDED}.Release|x64.ActiveCfg = Release|Win32
{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Debug|Win32.ActiveCfg = Debug|Win32
{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Debug|Win32.Build.0 = Debug|Win32
{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Debug|x64.ActiveCfg = Debug|Win32
{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Release|Win32.ActiveCfg = Release|Win32
{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Release|Win32.Build.0 = Release|Win32
{534B6F8A-B899-4C68-A10C-BB98FFCB35D6}.Release|x64.ActiveCfg = Release|Win32
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Debug|Win32.ActiveCfg = Debug|Win32
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Debug|Win32.Build.0 = Debug|Win32
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Debug|x64.ActiveCfg = Debug|x64
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Debug|x64.Build.0 = Debug|x64
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Release|Win32.ActiveCfg = Release|Win32
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Release|Win32.Build.0 = Release|Win32
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Release|x64.ActiveCfg = Release|x64
{BBD2ECDC-C622-409E-A6CF-2010140D8B55}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE