1
=== removed file 'src/include/server/mir/frontend/unsupported_feature_exception.h'
2
--- src/include/server/mir/frontend/unsupported_feature_exception.h	2014-09-18 09:18:01 +0000
3
+++ src/include/server/mir/frontend/unsupported_feature_exception.h	1970-01-01 00:00:00 +0000
4
@@ -1,41 +0,0 @@
5
1
/*
6
2
 * Copyright © 2014 Canonical Ltd.
7
3
 *
8
4
 * This program is free software: you can redistribute it and/or modify it
9
5
 * under the terms of the GNU General Public License version 3,
10
6
 * as published by the Free Software Foundation.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 *
20
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
21
17
 */
22
18
23
19
24
20
#ifndef MIR_FRONTEND_UNSUPPORTED_FEATURE_EXCEPTION_H_
25
21
#define MIR_FRONTEND_UNSUPPORTED_FEATURE_EXCEPTION_H_
26
22
27
23
#include <stdexcept>
28
24
29
25
namespace mir
30
26
{
31
27
namespace frontend
32
28
{
33
29
class unsupported_feature : public std::runtime_error
34
30
{
35
31
public:
36
32
    unsupported_feature()
37
33
        : std::runtime_error{"Unsupported feature requested"}
38
34
    {
39
35
    }
40
36
};
41
37
}
42
38
}
43
39
44
40
45
41
#endif /* MIR_FRONTEND_UNSUPPORTED_FEATURE_EXCEPTION_H_ */
46
42
0
47
=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
48
--- src/server/frontend/protobuf_message_processor.cpp	2016-10-12 06:03:15 +0000
49
+++ src/server/frontend/protobuf_message_processor.cpp	2016-11-11 17:55:37 +0000
50
@@ -22,7 +22,6 @@
51
22
#include "mir/frontend/message_processor_report.h"
22
#include "mir/frontend/message_processor_report.h"
52
23
#include "mir/frontend/protobuf_message_sender.h"
23
#include "mir/frontend/protobuf_message_sender.h"
53
24
#include "mir/frontend/template_protobuf_message_processor.h"
24
#include "mir/frontend/template_protobuf_message_processor.h"
54
25
#include "mir/frontend/unsupported_feature_exception.h"
55
26
#include <mir/protobuf/display_server_debug.h>
25
#include <mir/protobuf/display_server_debug.h>
56
27
#include "mir/client_visible_error.h"
26
#include "mir/client_visible_error.h"
57
28
27
58
@@ -322,7 +321,7 @@
59
322
                auto debug_interface = dynamic_cast<mir::protobuf::DisplayServerDebug*>(display_server.get());
321
                auto debug_interface = dynamic_cast<mir::protobuf::DisplayServerDebug*>(display_server.get());
60
323
                invoke(this, debug_interface, &mir::protobuf::DisplayServerDebug::translate_surface_to_screen, invocation);
322
                invoke(this, debug_interface, &mir::protobuf::DisplayServerDebug::translate_surface_to_screen, invocation);
61
324
            }
323
            }
63
325
            catch (mir::frontend::unsupported_feature const&)
324
            catch (std::runtime_error const&)
64
326
            {
325
            {
65
327
                std::string message{"Server does not support the client debugging interface"};
326
                std::string message{"Server does not support the client debugging interface"};
66
328
                invoke(this,
327
                invoke(this,
67
329
328
68
=== modified file 'src/server/scene/unsupported_coordinate_translator.cpp'
69
--- src/server/scene/unsupported_coordinate_translator.cpp	2016-01-29 08:18:22 +0000
70
+++ src/server/scene/unsupported_coordinate_translator.cpp	2016-11-11 17:55:37 +0000
71
@@ -17,10 +17,11 @@
72
17
 */
17
 */
73
18
18
74
19
#include "unsupported_coordinate_translator.h"
19
#include "unsupported_coordinate_translator.h"
75
20
#include "mir/frontend/unsupported_feature_exception.h"
76
21
20
77
22
#include <boost/exception/all.hpp>
21
#include <boost/exception/all.hpp>
78
23
22
79
23
#include <stdexcept>
80
24
81
24
namespace mg = mir::geometry;
25
namespace mg = mir::geometry;
82
25
namespace mf = mir::frontend;
26
namespace mf = mir::frontend;
83
26
namespace ms = mir::scene;
27
namespace ms = mir::scene;
84
@@ -29,5 +30,5 @@
85
29
        std::shared_ptr<mf::Surface> /*surface*/,
30
        std::shared_ptr<mf::Surface> /*surface*/,
86
30
        int32_t /*x*/, int32_t /*y*/)
31
        int32_t /*x*/, int32_t /*y*/)
87
31
{
32
{
89
32
    BOOST_THROW_EXCEPTION(mf::unsupported_feature());
33
    BOOST_THROW_EXCEPTION(std::runtime_error{"Unsupported feature requested"});
90
33
}
34
}
Reviewer	Review Type	Date Requested	Status
Andreas Pokorny (community)			Approve on 2016-11-12
Mir CI Bot	continuous-integration		Approve on 2016-11-11
Stephen M. Webb (community)		2016-11-11	Approve on 2016-11-11
Review via email: mp+310676@code.launchpad.net