# HG changeset patch # User Frank Benoit # Date 1239219785 -7200 # Node ID c73c01191fea42b6e8080315d056f07703e226a6 # Parent 64ad955928ca7eff2b438c8deb6b31f502feab75 Fix compile error with dmd 1.042, duplicate attribute. It does no more like the combination of protected and package. diff -r 64ad955928ca -r c73c01191fea org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.d --- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.d Wed Apr 08 21:42:10 2009 +0200 +++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/InternalJob.d Wed Apr 08 21:43:05 2009 +0200 @@ -175,14 +175,14 @@ /* (non-Javadoc) * @see Job#cancel() */ - protected package bool cancel() { + /*protected package*/ bool cancel() { return manager.cancel_package(this); } /* (non-Javadoc) * @see Job#canceling() */ - protected package void canceling() { + /*protected package*/ void canceling() { //default implementation does nothing } @@ -224,7 +224,7 @@ /* (non-Javadoc) * @see Job#getPriority() */ - protected package int getPriority() { + /*protected package*/ int getPriority() { return priority; } @@ -256,7 +256,7 @@ /* (non-Javadoc) * @see Job#getRule */ - protected package ISchedulingRule getRule() { + /*protected package*/ ISchedulingRule getRule() { return schedulingRule; } package ISchedulingRule getRule_package() { diff -r 64ad955928ca -r c73c01191fea org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.d --- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.d Wed Apr 08 21:42:10 2009 +0200 +++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.d Wed Apr 08 21:43:05 2009 +0200 @@ -77,7 +77,7 @@ * ThreadJob represents. This will be null if this thread * job is capturing a rule acquired outside of a job. */ - protected package Job realJob; + /*protected package*/ Job realJob; /** * The stack of rules that have been begun in this thread, but not yet ended. */ diff -r 64ad955928ca -r c73c01191fea org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.d --- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.d Wed Apr 08 21:42:10 2009 +0200 +++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/WorkerPool.d Wed Apr 08 21:43:05 2009 +0200 @@ -81,7 +81,7 @@ */ private Worker[] threads; - protected package this(JobManager manager) { + /*protected package*/ this(JobManager manager) { threads = new Worker[10]; this.manager = manager; mutex = new Mutex; @@ -164,7 +164,7 @@ * Notification that a job has been added to the queue. Wake a worker, * creating a new worker if necessary. The provided job may be null. */ - protected package void jobQueued() { + /*protected package*/ void jobQueued() { synchronized(mutex){ //if there is a sleeping thread, wake it up if (sleepingThreads > 0) {