← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/mongo/db/pipeline/accumulator.cpp

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/db/pipeline/accumulator.cpp
36
36
        ExpressionNary() {
37
37
    }
38
38
 
39
 
    void Accumulator::opToBson(
40
 
        BSONObjBuilder *pBuilder, string opName,
41
 
        string fieldName, bool requireExpression) const {
 
39
    void Accumulator::opToBson(BSONObjBuilder *pBuilder, StringData opName,
 
40
                               StringData fieldName, bool requireExpression) const {
42
41
        verify(vpOperand.size() == 1);
43
42
        BSONObjBuilder builder;
44
43
        vpOperand[0]->addToBsonObj(&builder, opName, requireExpression);
45
44
        pBuilder->append(fieldName, builder.done());
46
45
    }
47
46
 
48
 
    void Accumulator::addToBsonObj(
49
 
        BSONObjBuilder *pBuilder, string fieldName,
50
 
        bool requireExpression) const {
 
47
    void Accumulator::addToBsonObj(BSONObjBuilder *pBuilder,
 
48
                                   StringData fieldName,
 
49
                                   bool requireExpression) const {
51
50
        opToBson(pBuilder, getOpName(), fieldName, requireExpression);
52
51
    }
53
52