* Fixed GCC 4 build and warnings.
* Used std::vector in BlockingQueue instead of Ingo's Vector until I can figure out the GCC4 problems. This is untested, but I will test this on another machine in a minute. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30423 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -135,7 +135,7 @@ CopyEngine::MessageReceived(BMessage* message)
|
||||
|
||||
|
||||
void
|
||||
CopyEngine::SetStatusMessage(char *status)
|
||||
CopyEngine::SetStatusMessage(const char *status)
|
||||
{
|
||||
BMessage msg(STATUS_MESSAGE);
|
||||
msg.AddString("status", status);
|
||||
@@ -297,7 +297,7 @@ bigtime_t now;
|
||||
// Something besides Trash
|
||||
entries++;
|
||||
}
|
||||
|
||||
|
||||
if (entries > 0)
|
||||
break;
|
||||
}
|
||||
@@ -324,7 +324,7 @@ bigtime_t now;
|
||||
err = B_CANCELED;
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
||||
|
||||
LaunchInitScript(targetDirectory);
|
||||
|
||||
@@ -386,7 +386,7 @@ CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir)
|
||||
&& !fControl->CheckUserCanceled()) {
|
||||
StatStruct statbuf;
|
||||
entry.GetStat(&statbuf);
|
||||
|
||||
|
||||
Undo undo;
|
||||
if (S_ISDIR(statbuf.st_mode)) {
|
||||
char name[B_FILE_NAME_LENGTH];
|
||||
|
||||
Reference in New Issue
Block a user