Remove boost library dependency.

[apps/agl-service-can-low-level.git] / src / openxc / message_set.hpp

diff --git a/src/openxc/message_set.hpp b/src/openxc/message_set.hpp
index 37b40fc..935817e 100755 (executable)
--- a/src/openxc/message_set.hpp
+++ b/src/openxc/message_set.hpp
@@ -18,13 +18,14 @@ namespace openxc
        private:\r
                std::string                                                     name_;\r
                bool                                                            bit_numbering_inverted_;\r
-               std::uint32_t                                           max_message_frequency_;\r
+               float                                                           max_message_frequency_;\r
                can_bus_mode                                            raw_can_mode_;\r
                std::vector<std::string>                        parents_;\r
                std::vector<std::string>                        initializers_;\r
                std::vector<std::string>                        loopers_;\r
                std::map<std::string, can_bus>          buses_;\r
-               std::map<std::string, can_message>      messages_;\r
+               //std::map<std::string, can_message>    messages_;\r
+               std::vector<can_message>                        messages_;\r
                std::vector<diagnostic_message>         diagnostic_messages_;\r
                std::vector<mapping>                            mappings_;\r
                std::vector<std::string>                        extra_sources_;\r
@@ -37,20 +38,18 @@ namespace openxc
                \r
                std::string name() const;\r
                bool bit_numbering_inverted() const;\r
-               std::uint32_t max_message_frequency() const;\r
+               float max_message_frequency() const;\r
                can_bus_mode raw_can_mode() const;\r
                const std::vector<std::string>& parents() const;\r
                const std::vector<std::string>& initializers() const;\r
                const std::vector<std::string>& loopers() const;\r
                const std::map<std::string, can_bus>& buses() const;\r
-               const std::map<std::string, can_message>& messages() const;\r
+               const std::vector<can_message>& messages() const;\r
                const std::vector<diagnostic_message>& diagnostic_messages() const;\r
                const std::vector<mapping>& mappings() const;\r
                const std::vector<std::string>& extra_sources() const;\r
                const std::vector<command>& commands() const;\r
                \r
-               std::string to_initializer() const;\r
-\r
                void from_json(const nlohmann::json& j);\r
                nlohmann::json to_json() const;\r
        };\r