← Back to branch summary

~ubuntu-branches/ubuntu/precise/ceph/precise

« back to all changes in this revision

Viewing changes to src/include/encoding.h

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Clint Byrum, Micah Gersten
  • Date: 2011-02-12 22:50:26 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110212225026-yyyw4tk0msgql3ul
Tags: 0.24.2-0ubuntu1
https://launchpad.net/bugs/658670
https://launchpad.net/bugs/684011
[ Clint Byrum <clint@ubuntu.com> ]
* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libceph1-dev, libcrush1-dev and 
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev
* debian/watch: added watch file

[ Micah Gersten <micahg@ubuntu.com> ]
* debian/control: add Homepage

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/include/encoding.h
450
450
  decode(n, p);
451
451
  m.clear();
452
452
  while (n--) {
453
 
    T k;
454
 
    decode(k, p);
455
 
    typename std::multimap<T,U>::iterator it;
456
 
    U u;
457
 
    it = m.insert(std::pair<T,U>(k, u));
 
453
    typename std::pair<T,U> tu;
 
454
    decode(tu.first, p);
 
455
    typename std::multimap<T,U>::iterator it = m.insert(tu);
458
456
    decode(it->second, p);
459
457
  }
460
458
}