Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
88f41f596f
|
@ -187,7 +187,7 @@ namespace ver_2
|
|||
{
|
||||
assert(NULL != param && this == param->mgr);
|
||||
|
||||
std::list<std::string>::const_iterator iter;
|
||||
std::list<std::string>::iterator iter;
|
||||
for (iter = m_saveFilePathList.begin(); iter != m_saveFilePathList.end(); ++iter)
|
||||
{
|
||||
if (*iter == param->fileName)
|
||||
|
@ -382,7 +382,7 @@ namespace ver_2
|
|||
int ret = -1;
|
||||
errInfo = "错误";
|
||||
|
||||
std::list<std::string>::const_iterator iter;
|
||||
std::list<std::string>::iterator iter;
|
||||
for (iter = m_saveFilePathList.begin(); iter != m_saveFilePathList.end(); ++iter)
|
||||
{
|
||||
if (filePath == *iter)
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue