Hm, previous bug fix causes gcc to emit warning about inaccessible base class due to ambiguity. Revert fix thusly.
Hm, previous bug fix causes gcc to emit warning about inaccessible base class due to ambiguity. Revert fix thusly.


git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@5632 0785d39b-7218-0410-832d-ea1e28bc413d

natashasharma/dealii,msteigemann/dealii,Arezou-gh/dealii,mtezzele/dealii,johntfoster/dealii,msteigemann/dealii,natashasharma/dealii,angelrca/dealii,JaeryunYim/dealii,adamkosik/dealii,andreamola/dealii,msteigemann/dealii,naliboff/dealii,JaeryunYim/dealii,maieneuro/dealii,sairajat/dealii,flow123d/dealii,gpitton/dealii,flow123d/dealii,maieneuro/dealii,pesser/dealii,nicolacavallini/dealii,ESeNonFossiIo/dealii,maieneuro/dealii,rrgrove6/dealii,adamkosik/dealii,naliboff/dealii,mtezzele/dealii,angelrca/dealii,natashasharma/dealii,nicolacavallini/dealii,adamkosik/dealii,maieneuro/dealii,sairajat/dealii,mac-a/dealii,kalj/dealii,rrgrove6/dealii,angelrca/dealii,YongYang86/dealii,kalj/dealii,Arezou-gh/dealii,angelrca/dealii,angelrca/dealii,kalj/dealii,shakirbsm/dealii,kalj/dealii,Arezou-gh/dealii,pesser/dealii,sairajat/dealii,kalj/dealii,Arezou-gh/dealii,spco/dealii,ibkim11/dealii,mac-a/dealii,lue/dealii,sriharisundar/dealii,EGP-CIG-REU/dealii,EGP-CIG-REU/dealii,mac-a/dealii,naliboff/dealii,rrgrove6/dealii,natashasharma/dealii,sairajat/dealii,YongYang86/dealii,rrgrove6/dealii,ESeNonFossiIo/dealii,lpolster/dealii,andreamola/dealii,natashasharma/dealii,mtezzele/dealii,sairajat/dealii,sriharisundar/dealii,flow123d/dealii,nicolacavallini/dealii,mac-a/dealii,mac-a/dealii,EGP-CIG-REU/dealii,ibkim11/dealii,ibkim11/dealii,ESeNonFossiIo/dealii,shakirbsm/dealii,JaeryunYim/dealii,spco/dealii,nicolacavallini/dealii,sriharisundar/dealii,lue/dealii,maieneuro/dealii,andreamola/dealii,YongYang86/dealii,gpitton/dealii,danshapero/dealii,flow123d/dealii,ibkim11/dealii,shakirbsm/dealii,EGP-CIG-REU/dealii,shakirbsm/dealii,andreamola/dealii,shakirbsm/dealii,danshapero/dealii,jperryhouts/dealii,rrgrove6/dealii,pesser/dealii,flow123d/dealii,flow123d/dealii,msteigemann/dealii,ibkim11/dealii,msteigemann/dealii,mtezzele/dealii,ESeNonFossiIo/dealii,msteigemann/dealii,mac-a/dealii,naliboff/dealii,rrgrove6/dealii,kalj/dealii,ESeNonFossiIo/dealii,johntfoster/dealii,sairajat/dealii,nicolacavallini/dealii,naliboff/dealii,lue/dealii,Arezou-gh/dealii,angelrca/dealii,spco/dealii,sriharisundar/dealii,Arezou-gh/dealii,lpolster/dealii,andreamola/dealii,spco/dealii,lue/dealii,JaeryunYim/dealii,shakirbsm/dealii,msteigemann/dealii,YongYang86/dealii,ESeNonFossiIo/dealii,jperryhouts/dealii,adamkosik/dealii,gpitton/dealii,gpitton/dealii,JaeryunYim/dealii,gpitton/dealii,ibkim11/dealii,mac-a/dealii,lue/dealii,johntfoster/dealii,jperryhouts/dealii,jperryhouts/dealii,mtezzele/dealii,natashasharma/dealii,maieneuro/dealii,pesser/dealii,jperryhouts/dealii,andreamola/dealii,lpolster/dealii,lpolster/dealii,adamkosik/dealii,lpolster/dealii,sriharisundar/dealii,nicolacavallini/dealii,angelrca/dealii,EGP-CIG-REU/dealii,sriharisundar/dealii,pesser/dealii,johntfoster/dealii,pesser/dealii,JaeryunYim/dealii,danshapero/dealii,lue/dealii,rrgrove6/dealii,danshapero/dealii,natashasharma/dealii,YongYang86/dealii,EGP-CIG-REU/dealii,danshapero/dealii,gpitton/dealii,Arezou-gh/dealii,johntfoster/dealii,YongYang86/dealii,ESeNonFossiIo/dealii,YongYang86/dealii,spco/dealii,jperryhouts/dealii,shakirbsm/dealii,andreamola/dealii,ibkim11/dealii,pesser/dealii,JaeryunYim/dealii,johntfoster/dealii,sriharisundar/dealii,adamkosik/dealii,maieneuro/dealii,danshapero/dealii,danshapero/dealii,kalj/dealii,nicolacavallini/dealii,mtezzele/dealii,lpolster/dealii,mtezzele/dealii,lpolster/dealii,gpitton/dealii,flow123d/dealii,spco/dealii,johntfoster/dealii,EGP-CIG-REU/dealii,sairajat/dealii,jperryhouts/dealii,lue/dealii,spco/dealii,naliboff/dealii,naliboff/dealii,adamkosik/dealii