mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 15:15:25 +02:00
Remove assert keyword since nightly builds dont understand it - supposedly due to a bug in Platform Ant support
This commit is contained in:
parent
7125c9dd9d
commit
172f651769
4 changed files with 8 additions and 4 deletions
|
@ -21,7 +21,7 @@ plugin@org.eclipse.rse.sdk=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cv
|
|||
plugin@org.eclipse.rse.services.dstore=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
|
||||
plugin@org.eclipse.rse.services.files.ftp=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
|
||||
plugin@org.eclipse.rse.services.local=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
|
||||
plugin@org.eclipse.rse.services.ssh=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
|
||||
plugin@org.eclipse.rse.services.ssh=v20060811b,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
|
||||
plugin@org.eclipse.rse.services=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
|
||||
plugin@org.eclipse.rse.shells.ui=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
|
||||
plugin@org.eclipse.rse.subsystems.files.core=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
|
||||
|
@ -35,5 +35,5 @@ plugin@org.eclipse.rse.subsystems.processes.local=v20060811,:pserver:anonymous:n
|
|||
plugin@org.eclipse.rse.subsystems.shells.core=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
|
||||
plugin@org.eclipse.rse.subsystems.shells.dstore=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
|
||||
plugin@org.eclipse.rse.subsystems.shells.local=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
|
||||
plugin@org.eclipse.rse.subsystems.shells.ssh=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
|
||||
plugin@org.eclipse.rse.subsystems.shells.ssh=v20060811b,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
|
||||
plugin@org.eclipse.rse.ui=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
|
|
@ -1 +1,3 @@
|
|||
bin
|
||||
build.xml
|
||||
javaCompiler...args
|
||||
|
|
|
@ -75,13 +75,15 @@ public class Mutex {
|
|||
wait(timeLeft > pollTime ? pollTime : timeLeft);
|
||||
Activator.trace("Mutex: wakeup "+myself+" ?"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
//I'm still in the list, nobody is allowed to take me out!
|
||||
assert !fWaitQueue.isEmpty();
|
||||
//assert !fWaitQueue.isEmpty();
|
||||
if (!fLocked && fWaitQueue.get(0) == myself) {
|
||||
break; //gee it's my turn!
|
||||
}
|
||||
long curTime = System.currentTimeMillis();
|
||||
timeLeft = start + timeout - curTime;
|
||||
if (monitor!=null) {
|
||||
//TODO put the calls to the progress monitor out
|
||||
//of the synchronized{}
|
||||
canceled = monitor.isCanceled();
|
||||
if (!canceled && (curTime>nextProgressUpdate)) {
|
||||
monitor.worked(1);
|
||||
|
|
|
@ -150,7 +150,7 @@ public class SshServiceCommandShell extends ServiceCommandShell implements ISyst
|
|||
*/
|
||||
protected String getPromptCommand() {
|
||||
IHostShell shell = getHostShell();
|
||||
assert shell instanceof SshHostShell;
|
||||
//assert shell instanceof SshHostShell;
|
||||
if (shell instanceof SshHostShell) {
|
||||
return ((SshHostShell)shell).getPromptCommand();
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue