alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ltsmin: remove ltdl from public headers

Browse source 
* spot/ltsmin/Makefile.am,
spot/ltsmin/spins_interface.cc,
spot/ltsmin/spins_interface.hh: here.
This commit is contained in:
Etienne Renault 2017-04-18 17:28:43 +02:00
parent d3b143574b
commit d95428d245
3 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spot/ltsmin/Makefile.am
View file

@ -39,7 +39,7 @@ libspotltsmin_la_LIBADD = \
$(top_builddir)/lib/libgnu.la \ $(top_builddir)/lib/libgnu.la \
$(LIBLTDL) -lpthread $(LIBLTDL) -lpthread
libspotltsmin_la_LDFLAGS = -no-undefined $(SYMBOLIC_LDFLAGS) libspotltsmin_la_LDFLAGS = -no-undefined $(SYMBOLIC_LDFLAGS)
libspotltsmin_la_SOURCES = ltsmin.cc libspotltsmin_la_SOURCES = ltsmin.cc spins_interface.cc
EXTRA_DIST = $(srcdir)/libspotltsmin.pc.in EXTRA_DIST = $(srcdir)/libspotltsmin.pc.in

32
spot/ltsmin/spins_interface.cc Normal file
View file

@ -0,0 +1,32 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2017 Laboratoire de Recherche et Développement de
// l'Epita (LRDE)
//
// This file is part of Spot, a model checking library.
//
// Spot is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License, or
// (at your option) any later version.
//
// Spot is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
// License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <spot/ltsmin/spins_interface.hh>
#include <ltdl.h>
namespace spot
{
spins_interface::~spins_interface()
{
lt_dlhandle h = (lt_dlhandle) handle;
if (h)
lt_dlclose(h);
lt_dlexit();
}
}

14
spot/ltsmin/spins_interface.hh
View file

@ -19,8 +19,8 @@
#pragma once #pragma once
#include <ltdl.h>
#include <memory> #include <memory>
namespace spot namespace spot
{ {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -38,7 +38,9 @@ namespace spot
struct spins_interface struct spins_interface
{ {
lt_dlhandle handle; // handle to the dynamic library // handle to the dynamic library. The variable is of type lt_dlhandle, but
// we need this trick since we cannot put ltdl.h in public headers
void* handle;
void (*get_initial_state)(void *to); void (*get_initial_state)(void *to);
int (*have_property)(); int (*have_property)();
int (*get_successors)(void* m, int *in, TransitionCB, void *arg); int (*get_successors)(void* m, int *in, TransitionCB, void *arg);
@ -49,13 +51,7 @@ namespace spot
const char* (*get_type_name)(int type); const char* (*get_type_name)(int type);
int (*get_type_value_count)(int type); int (*get_type_value_count)(int type);
const char* (*get_type_value_name)(int type, int value); const char* (*get_type_value_name)(int type, int value);
~spins_interface();
~spins_interface()
{
if (handle)
lt_dlclose(handle);
lt_dlexit();
}
}; };
using spins_interface_ptr = std::shared_ptr<const spins_interface>; using spins_interface_ptr = std::shared_ptr<const spins_interface>;