Merge lp:~alan-griffiths/mir/support-multiple-inheritance-in-config into lp:~mir-team/mir/trunk

[Alan Griffiths]

config: support for multiple inheritance

config: support for multiple inheritance

It looks trivial, but if users of mir want to mix configuration interfaces then virtual inheritance here gives them more, better options.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:675
http://jenkins.qa.ubuntu.com/job/mir-ci/564/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/656/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/539
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/298/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/564/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/245/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/658/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/541
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-autolanding/35/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-autolanding-build/./distribution=quantal,flavor=amd64/133

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:676
http://jenkins.qa.ubuntu.com/job/mir-ci/566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/300

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/566/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-05-02 04:17:41 +0000
+++ examples/render_surfaces.cpp	2013-05-09 16:20:32 +0000
@@ -252,7 +252,7 @@
 {
 public:
     RenderSurfacesServerConfiguration(int argc, char const** argv)
-        : mir::DefaultServerConfiguration{argc, argv}
+        : mir::DefaultServerConfiguration(argc, argv)
     {
         namespace po = boost::program_options;
 

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-05-02 00:11:18 +0000
+++ include/server/mir/default_server_configuration.h	2013-05-09 16:20:32 +0000
@@ -96,7 +96,7 @@
 class Logger;
 }
 
-class DefaultServerConfiguration : public ServerConfiguration
+class DefaultServerConfiguration : public virtual ServerConfiguration
 {
 public:
     DefaultServerConfiguration(int argc, char const* argv[]);