← Back to branch summary

~ubuntu-branches/ubuntu/wily/xmms2/wily

« back to all changes in this revision

Viewing changes to src/include/xmmsclient/xmmsclient++/result.h

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2008-07-04 16:23:34 UTC
  • mfrom: (1.1.5 upstream) (6.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080704162334-b3esbkcapt8wbrk4
Tags: 0.5DrLecter-2ubuntu1
https://launchpad.net/bugs/241098
https://launchpad.net/bugs/212566
https://launchpad.net/bugs/222341
* Merge from debian unstable (LP: #241098), remaining changes:
  + debian/control:
    + Update Maintainer field
    + add lpia to xmms2-plugin-alsa supported architectures
    + Added liba52-0.7.4-dev to build depends
  + debian/rules: Added patch, patch-stamp and unpatch
  + changed 01_gcc4.3.patch:
    + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
* New upstream relase fixes LP: #212566, #222341

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/include/xmmsclient/xmmsclient++/result.h
233
233
 
234
234
        typedef Adapter< int32_t, int32_t, xmmsc_result_get_int > IntResult;
235
235
        typedef Adapter< uint32_t, uint32_t, xmmsc_result_get_uint > UintResult;
236
 
        typedef Adapter< std::string, char*, xmmsc_result_get_string > StringResult;
 
236
        typedef Adapter< std::string, const char*, xmmsc_result_get_string > StringResult;
237
237
        typedef Adapter< xmms_playback_status_t, uint32_t,
238
238
                         xmmsc_result_get_uint > StatusResult;
239
239