← Back to branch summary

~ubuntu-branches/ubuntu/quantal/zeroc-ice/quantal

« back to all changes in this revision

Viewing changes to cpp/include/Freeze/Map.h

  • Committer: Package Import Robot
  • Author(s): Michael Ziegler
  • Date: 2012-07-07 15:24:30 UTC
  • mfrom: (6.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20120707152430-kktx4mfmywkz382j
Tags: 3.4.2-8.1
http://bugs.debian.org/672066
* Non-maintainer upload.
* Revert the patch 'fixing' the FTBFS with gcc-4.7 that breaks ABI, and
  add force_gcc_4.6.patch.  We need to do this all in the upstream makefile
  because it has a silly check for the intel icpc compiler that we need to
  patch around or the build will fail with anything but c++ as the compiler,
  and we can't just override CXX in /rules because the wonderful 3.0 (quilt)
  system will revert that patch before the clean target is run ensuring that
  hilarious fail is guaranteed.
  Closes: #672066

Show diffs side-by-side

added added

removed removed

Lines of Context:
cpp/include/Freeze/Map.h
426
426
 
427
427
    ConstIterator(MapHelper& mapHelper, const Ice::CommunicatorPtr& communicator) :
428
428
        _helper(IteratorHelper::create(mapHelper, true)), 
429
 
        _communicator(communicator),
 
429
        _communicator(_communicator),
430
430
        _refValid(false)
431
431
    {
432
432
    }