Commit b482cc3c authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix various compilation issues

	A hash function was declared in a .hxx file even though
	it was not templated.
	The makefile associated to the eps_removal bench was not generated.
	* include/vaucanson/misc/hash.hh,
	* include/vaucanson/misc/hash.hxx: make a hash function inline.
	* src/benchs/eps_removal/Makefile.am,
	* src/benchs/eps_removal/eps_removal-bench.cc,
	* src/benchs/generate_benchs.sh:
	 fix the generation of the related Makefile.
parent 5b045761
2007-10-06 Guillaume Lazzara <z@lrde.epita.fr>
Fix various compilation issues
A hash function was declared in a .hxx file even though
it was not templated.
The makefile associated to the eps_removal bench was not generated.
* include/vaucanson/misc/hash.hh,
* include/vaucanson/misc/hash.hxx: make a hash function inline.
* src/benchs/eps_removal/Makefile.am,
* src/benchs/eps_removal/eps_removal-bench.cc,
* src/benchs/generate_benchs.sh:
fix the generation of the related Makefile.
2007-10-06 Guillaume Lazzara <z@lrde.epita.fr>
Rename graph implementation files and fix compilation issues.
......
......@@ -80,7 +80,10 @@ namespace vcsn
struct hash_state_handler
{
std::size_t operator() (const handler<state_h, unsigned*>& h) const;
inline std::size_t operator() (const handler<state_h, unsigned*>& h) const
{
return ::boost::hash_value (reinterpret_cast<unsigned int>(h.value()));
}
};
}
} // End of namespace vcsn
......
......@@ -143,12 +143,6 @@ namespace vcsn
{
return ::boost::hash_value (h.value());
}
std::size_t
hash_state_handler::operator() (const handler<state_h, unsigned*>& h) const
{
return ::boost::hash_value (reinterpret_cast<unsigned int>(h.value()));
}
}
}
......
# eps_removal/Makefile.am * -*- Makefile -*-
#
# DO NOT EDIT BY HAND - Generated by ./generate_benchs.sh
#
include $(top_srcdir)/src/benchs/common/bench.mk
EXTRA_PROGRAMS = eps_removal_boolean-bench eps_removal_z-bench
COMMON_SOURCES = eps_removal-bench.cc eps_removal_bench.hh
eps_removal_boolean_bench_SOURCES = $(COMMON_SOURCES)
eps_removal_boolean_bench_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton
eps_removal_z_bench_SOURCES = $(COMMON_SOURCES)
eps_removal_z_bench_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton
benchs: $(EXTRA_PROGRAMS)
@echo '======================='; \
echo '|Epsilon removal bench|'; \
echo '======================='; \
for n_states in $$(seq 14 20); do \
echo "----------------------For $$n_states states"; \
echo "--------------VCSN boolean:"; \
./eps_removal_boolean-bench $$n_states; \
echo "--------------VCSN Z:"; \
./eps_removal_z-bench $$n_states; \
done;
EXTRA_PROGRAMS =
EXTRA_PROGRAMS += eps_removal-bench
eps_removal_bench_SOURCES = eps_removal-bench.cc eps_removal_bench.hh
//
// DO NOT EDIT BY HAND - Generated by ./generate_benchs.sh
//
// Vaucanson, a generic library for finite state machines.
// Copyright (C) 2006, 2007 The Vaucanson Group.
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......
......@@ -100,7 +100,7 @@ case $1:$# in
--all:1)
BENCH_DIRS="determinization \
minimization_debruijn derived_terms minimization_2n \
quotient composition"
quotient composition eps_removal"
;;
--all:* | *:0)
echo >&2 "invalid arguments: $@"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment