diff options
| author | David Robillard <d@drobilla.net> | 2008-10-18 21:33:59 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-18 21:33:59 +0000 |
| commit | be7cc35781e348f443abbd3910519707aea11904 (patch) | |
| tree | 22ba99bf53dbe346103bf117055685ff7bd18f8a | |
| parent | 686f898c9004d4207d7411df3a3274e93d72d559 (diff) | |
| download | raul-be7cc35781e348f443abbd3910519707aea11904.tar.gz raul-be7cc35781e348f443abbd3910519707aea11904.tar.bz2 raul-be7cc35781e348f443abbd3910519707aea11904.zip | |
Lower glib/glibmm dependency to 2.14.
Fix optional parameters all over the palce because waf is retarded and sets failed check variables to ##some#stupid#name#like#this instead of false.
Portability fixes (Ingen (except GUI) and all dependencies builds on OSX).
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@1681 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | tests/table_test.cpp | 12 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tests/table_test.cpp b/tests/table_test.cpp index f0d1883..3fdde92 100644 --- a/tests/table_test.cpp +++ b/tests/table_test.cpp @@ -3,14 +3,18 @@ #include <utility> #include <map> #include <set> -#include <tr1/unordered_map> #include <sys/time.h> #include <raul/PathTable.hpp> #include <raul/Table.hpp> #include <raul/TableImpl.hpp> -#define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION 1 -#include <boost/functional/hash.hpp> +//#define WITH_TR1 1 + +#ifdef WITH_TR1 + #define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION 1 + #include <boost/functional/hash.hpp> + #include <tr1/unordered_map> +#endif using namespace Raul; using namespace std; @@ -347,6 +351,7 @@ benchmark(size_t n) cout << "Raul::Table time to lookup " << n << " values: \t" << delta_t << endl; +#ifdef WITH_TR1 /** boost::hash && std::unordered_map **/ tr1::unordered_map<string, int, boost::hash<string> > um; @@ -374,5 +379,6 @@ benchmark(size_t n) delta_t = (t2.tv_sec - t1.tv_sec) + (t2.tv_usec - t1.tv_usec) * 0.000001f; cout << "tr1::unordered_map + boost::hash time to lookup " << n << " values: \t" << delta_t << endl; +#endif } @@ -31,8 +31,8 @@ def set_options(opt): def configure(conf): autowaf.configure(conf) autowaf.check_tool(conf, 'compiler_cxx') - autowaf.check_pkg(conf, 'glibmm-2.4', destvar='GLIBMM', vnum='2.16.0', mandatory=True) - autowaf.check_pkg(conf, 'gthread-2.0', destvar='GTHREAD', vnum='2.16.0', mandatory=True) + autowaf.check_pkg(conf, 'glibmm-2.4', destvar='GLIBMM', vnum='2.14.0', mandatory=True) + autowaf.check_pkg(conf, 'gthread-2.0', destvar='GTHREAD', vnum='2.14.0', mandatory=True) autowaf.print_summary(conf) def build(bld): |