OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use std::shared_ptr instead of boost::shared_ptr

Browse Source 
our policy is that we only use boost if necessary, i.e., if the oldest
supported compiler does not support a given feature but boost
does. since we recently switched to GCC 4.4 or newer, std::shared_ptr
is available unconditionally.
This commit is contained in:
Andreas Lauser committed 2013-08-08 13:25:58 +02:00
1 parent b0349793fa
commit 70949c6edb
20 files changed
+68 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/test_blackoilfluid.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
#define BOOST_TEST_MODULE BlackoilFluidTest
#define BOOST_TEST_MAIN
#include <boost/test/unit_test.hpp>
#include <boost/shared_ptr.hpp>
#include <memory>
#include <iostream>
#include <iterator>
#include <vector>
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(test_blackoilfluid)
const EclipseGridParser deck (filename);
// setup pvt interface
std::vector<boost::shared_ptr<SinglePvtInterface> > props_;
std::vector<std::shared_ptr<SinglePvtInterface> > props_;
PhaseUsage phase_usage_ = phaseUsageFromDeck(deck);
enum PhaseIndex { Aqua = 0, Liquid = 1, Vapour = 2 };
int samples = 0;
tests/test_wells.cpp
+5 -5
View File
@@ -32,7 +32,7 @@
#include <iostream>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <memory>
BOOST_AUTO_TEST_CASE(Construction)
{
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(Construction)
const int nwells = 2;
const int nperfs = 2;
boost::shared_ptr<Wells> W(create_wells(nphases, nwells, nperfs),
std::shared_ptr<Wells> W(create_wells(nphases, nwells, nperfs),
destroy_wells);
if (W) {
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE(Controls)
const int nwells = 1;
const int nperfs = 2;
boost::shared_ptr<Wells> W(create_wells(nphases, nwells, nperfs),
std::shared_ptr<Wells> W(create_wells(nphases, nwells, nperfs),
destroy_wells);
if (W) {
@@ -130,9 +130,9 @@ BOOST_AUTO_TEST_CASE(Copy)
const int nwells = 2;
const int nperfs = 2;
boost::shared_ptr<Wells> W1(create_wells(nphases, nwells, nperfs),
std::shared_ptr<Wells> W1(create_wells(nphases, nwells, nperfs),
destroy_wells);
boost::shared_ptr<Wells> W2;
std::shared_ptr<Wells> W2;
if (W1) {
int cells[] = { 0, 9 };