← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mongodb/utopic

« back to all changes in this revision

Viewing changes to src/mongo/db/stats/counters.cpp

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-07-03 09:23:46 UTC
  • mfrom: (1.3.10) (44.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20140703092346-c5bvt46wnzougyly
Tags: 1:2.6.3-0ubuntu1
https://launchpad.net/bugs/1295723
https://launchpad.net/bugs/1294455
* New upstream stable release:
  - Dropped patches, included upstream:
    + 0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
    + 0008-Use-system-libstemmer.patch
    + 0011-Use-a-signed-char-to-store-BSONType-enumerations.patch
    + 0001-SERVER-12064-Atomic-operations-for-gcc-non-Intel-arc.patch
    + 0002-SERVER-12065-Support-ARM-and-AArch64-builds.patch
  - d/p/*: Refreshed/rebased remaining patches.
  - Use system provided libyaml-cpp:
    + d/control: Add libyaml-cpp-dev to BD's.
    + d/rules: Enable --with-system-yaml option.
    + d/p/fix-yaml-detection.patch: Fix detection of libyaml-cpp library.
  - d/mongodb-server.mongodb.upstart: Sync changes from upstream.
  - d/control,mongodb-dev.*: Drop mongodb-dev package; it has no reverse
    dependencies and upstream no longer install header files.
  - d/NEWS: Point users to upstream upgrade documentation for upgrades
    from 2.4 to 2.6.
* Merge from Debian unstable.
* d/control: BD on libv8-3.14-dev to ensure that transitioning to new v8
  versions is a explicit action due to changes in behaviour in >= 3.25
  (LP: #1295723).
* d/mongodb-server.prerm: Dropped debug echo call from maintainer script
  (LP: #1294455).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/db/stats/counters.cpp
13
13
 *
14
14
 *    You should have received a copy of the GNU Affero General Public License
15
15
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
16
 *
 
17
 *    As a special exception, the copyright holders give permission to link the
 
18
 *    code of portions of this program with the OpenSSL library under certain
 
19
 *    conditions as described in each individual source file and distribute
 
20
 *    linked combinations including the program with the OpenSSL library. You
 
21
 *    must comply with the GNU Affero General Public License in all respects for
 
22
 *    all of the code used other than as permitted herein. If you modify file(s)
 
23
 *    with this exception, you may extend this exception to your version of the
 
24
 *    file(s), but you are not obligated to do so. If you do not wish to do so,
 
25
 *    delete this exception statement from your version. If you delete this
 
26
 *    exception statement from all source files in the program, then also delete
 
27
 *    it in the license file.
16
28
 */
17
29
 
18
30
 
19
 
#include "pch.h"
20
 
#include "../jsobj.h"
21
 
#include "counters.h"
 
31
#include "mongo/pch.h"
 
32
 
 
33
#include "mongo/db/stats/counters.h"
 
34
 
 
35
#include "mongo/db/jsobj.h"
22
36
 
23
37
namespace mongo {
24
38
    OpCounters::OpCounters() {}