Merge branch 'mesh_topology_output' into roles

[meshlink] / src / meshlink++.h

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 9500852bbf2c05f59715f3d36f16916aaebe82e4..ef578b113068cc8993bf3728d547f194c45bf06a 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -88,7 +88,7 @@ namespace meshlink {
        /// A class describing a MeshLink mesh.
        class mesh: public meshlink_handle_t {
        public:
-               mesh() {}
+               mesh() : meshlink_handle_t() {}
        
                virtual ~mesh() {
                        meshlink_close(this);
@@ -382,12 +382,13 @@ namespace meshlink {
         *  @param confbase The directory in which MeshLink will store its configuration files.
         *  @param name     The name which this instance of the application will use in the mesh.
         *  @param appname  The application name which will be used in the mesh.
+        *  @param dclass   The device class which will be used in the mesh.
         *
         *  @return         This function will return a pointer to a meshlink::mesh if MeshLink has succesfully set up its configuration files, NULL otherwise.
         */
        template<class MESH>
-       static MESH* open(const char *confbase, const char *name, const char* appname) {
-               void* mp = (void *)meshlink_open_with_size(confbase, name, appname, sizeof(MESH));
+       static MESH* open(const char *confbase, const char *name, const char* appname, dev_class_t devclass) {
+               void* mp = (void *)meshlink_open_with_size(confbase, name, appname, devclass, sizeof(MESH));
                return new (mp) MESH;
        }