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

« back to all changes in this revision

Viewing changes to src/mongo/db/projection.h

  • 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:
18
18
#pragma once
19
19
 
20
20
#include "mongo/pch.h"
 
21
#include "mongo/util/string_map.h"
21
22
#include "jsobj.h"
22
23
 
23
24
namespace mongo {
140
141
        bool _special; // true if this level can't be skipped or included without recursing
141
142
 
142
143
        //TODO: benchmark vector<pair> vs map
143
 
        typedef map<string, boost::shared_ptr<Projection> > FieldMap;
 
144
        typedef StringMap<boost::shared_ptr<Projection> > FieldMap;
144
145
        FieldMap _fields;
145
146
        BSONObj _source;
146
147
        bool _includeID;
150
151
        int _limit;
151
152
 
152
153
        // used for $elemMatch and positional operator ($)
153
 
        typedef map<string, shared_ptr<Matcher> > Matchers;
 
154
        typedef StringMap<boost::shared_ptr<Matcher> > Matchers;
154
155
        Matchers _matchers;
155
156
        ArrayOpType _arrayOpType;
156
157