mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-06 08:35:26 +02:00
Code Issues Wiki Activity

Remove assert keyword since nightly builds dont understand it - supposedly due to a bug in Platform Ant support

Browse source
This commit is contained in:
Martin Oberhuber 2006-08-11 17:34:55 +00:00
parent 7125c9dd9d
commit 172f651769
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releng/org.eclipse.rse.build/maps/rse.map
View file

@ -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.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.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.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.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.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 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.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.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.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 plugin@org.eclipse.rse.ui=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui

2
rse/plugins/org.eclipse.rse.services.ssh/.cvsignore
View file

@ -1 +1,3 @@
bin bin
build.xml
javaCompiler...args

4
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java
View file

@ -75,13 +75,15 @@ public class Mutex {
wait(timeLeft > pollTime ? pollTime : timeLeft); wait(timeLeft > pollTime ? pollTime : timeLeft);
Activator.trace("Mutex: wakeup "+myself+" ?"); //$NON-NLS-1$ //$NON-NLS-2$ Activator.trace("Mutex: wakeup "+myself+" ?"); //$NON-NLS-1$ //$NON-NLS-2$
//I'm still in the list, nobody is allowed to take me out! //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) { if (!fLocked && fWaitQueue.get(0) == myself) {
break; //gee it's my turn! break; //gee it's my turn!
} }
long curTime = System.currentTimeMillis(); long curTime = System.currentTimeMillis();
timeLeft = start + timeout - curTime; timeLeft = start + timeout - curTime;
if (monitor!=null) { if (monitor!=null) {
//TODO put the calls to the progress monitor out
//of the synchronized{}
canceled = monitor.isCanceled(); canceled = monitor.isCanceled();
if (!canceled && (curTime>nextProgressUpdate)) { if (!canceled && (curTime>nextProgressUpdate)) {
monitor.worked(1); monitor.worked(1);

2
rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java
View file

@ -150,7 +150,7 @@ public class SshServiceCommandShell extends ServiceCommandShell implements ISyst
*/ */
protected String getPromptCommand() { protected String getPromptCommand() {
IHostShell shell = getHostShell(); IHostShell shell = getHostShell();
assert shell instanceof SshHostShell; //assert shell instanceof SshHostShell;
if (shell instanceof SshHostShell) { if (shell instanceof SshHostShell) {
return ((SshHostShell)shell).getPromptCommand(); return ((SshHostShell)shell).getPromptCommand();
} }