diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-15 15:42:33 -0300 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-18 19:45:07 -0300 |
| commit | 59c0dc6bd2a86207d5f500d767bea98c8c16d3e9 (patch) | |
| tree | 25c888e878037b6ac4b0debd3396dc19628a6e27 | |
| parent | dc8dcf70f06304105d9a4e6467d98a266dbfe78f (diff) | |
Renamed templates used for conversions of containers.
| -rw-r--r-- | libshiboken/conversions.h | 10 | ||||
| -rw-r--r-- | tests/samplebinding/list_conversions.h | 2 | ||||
| -rw-r--r-- | tests/samplebinding/map_conversions.h | 2 | ||||
| -rw-r--r-- | tests/samplebinding/pair_conversions.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h index 0b94b328e..c9fe46e8b 100644 --- a/libshiboken/conversions.h +++ b/libshiboken/conversions.h @@ -492,14 +492,14 @@ template <> struct Converter<const char*> : Converter_CString<const char*> {}; // that are similar to the STL containers of the same name. // For example to create a converter for a std::list the following code is enough: -// template<typename T> struct Converter<std::list<T> > : Converter_std_list<std::list<T> > {}; +// template<typename T> struct Converter<std::list<T> > : StdListConverter<std::list<T> > {}; // And this for a std::map: // template<typename KT, typename VT> -// struct Converter<std::map<KT, VT> > : Converter_std_map<std::map<KT, VT> > {}; +// struct Converter<std::map<KT, VT> > : StdMapConverter<std::map<KT, VT> > {}; template <typename StdList> -struct Converter_std_list +struct StdListConverter { static inline bool isConvertible(PyObject* pyObj) { @@ -536,7 +536,7 @@ struct Converter_std_list }; template <typename StdPair> -struct Converter_std_pair +struct StdPairConverter { static inline bool isConvertible(PyObject* pyObj) { @@ -575,7 +575,7 @@ struct Converter_std_pair }; template <typename StdMap> -struct Converter_std_map +struct StdMapConverter { static inline bool isConvertible(PyObject* pyObj) { diff --git a/tests/samplebinding/list_conversions.h b/tests/samplebinding/list_conversions.h index 05a1b0604..6ed8d9647 100644 --- a/tests/samplebinding/list_conversions.h +++ b/tests/samplebinding/list_conversions.h @@ -1,4 +1,4 @@ namespace Shiboken { template<typename T> -struct Converter<std::list<T> > : Converter_std_list<std::list<T> > {}; +struct Converter<std::list<T> > : StdListConverter<std::list<T> > {}; } diff --git a/tests/samplebinding/map_conversions.h b/tests/samplebinding/map_conversions.h index 094bf52f7..005b40ed1 100644 --- a/tests/samplebinding/map_conversions.h +++ b/tests/samplebinding/map_conversions.h @@ -1,4 +1,4 @@ namespace Shiboken { template<typename KT, typename VT> -struct Converter<std::map<KT, VT> > : Converter_std_map<std::map<KT, VT> > {}; +struct Converter<std::map<KT, VT> > : StdMapConverter<std::map<KT, VT> > {}; } diff --git a/tests/samplebinding/pair_conversions.h b/tests/samplebinding/pair_conversions.h index a1f914c07..47e46d416 100644 --- a/tests/samplebinding/pair_conversions.h +++ b/tests/samplebinding/pair_conversions.h @@ -1,4 +1,4 @@ namespace Shiboken { template<typename FT, typename ST> -struct Converter<std::pair<FT, ST> > : Converter_std_pair<std::pair<FT, ST> > {}; +struct Converter<std::pair<FT, ST> > : StdPairConverter<std::pair<FT, ST> > {}; } |