[libdap] 14/22: add patch for auto_ptr (deprecated) -> unique_ptr
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Nov 4 15:20:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository libdap.
commit f2233b6c4f500f7fd0f82201a6f40962fe42de3f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Oct 3 15:34:00 2016 +0100
add patch for auto_ptr (deprecated) -> unique_ptr
---
debian/changelog | 6 +
debian/patches/g++-6.patch | 5 -
debian/patches/series | 1 +
debian/patches/unique_ptr.patch | 423 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 430 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4415f4..1debe5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdap (3.18.1-2) UNRELEASED; urgency=medium
+
+ * add patch for auto_ptr (deprecated) -> unique_ptr
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 03 Oct 2016 15:33:30 +0100
+
libdap (3.18.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/g++-6.patch b/debian/patches/g++-6.patch
deleted file mode 100644
index 0267e1a..0000000
--- a/debian/patches/g++-6.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Patch needed for G++-6 (c++11 ABI) changes
-Forwarded: no
-Last-Updated: 2016-02-16
-
diff --git a/debian/patches/series b/debian/patches/series
index ee9817d..876b2ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+unique_ptr.patch
pkgconfig.patch
# disable-docs.patch
disable-cache-test.patch
diff --git a/debian/patches/unique_ptr.patch b/debian/patches/unique_ptr.patch
new file mode 100644
index 0000000..93010a5
--- /dev/null
+++ b/debian/patches/unique_ptr.patch
@@ -0,0 +1,423 @@
+Index: libdap-3.18.1/tests/dmr-test.cc
+===================================================================
+--- libdap-3.18.1.orig/tests/dmr-test.cc
++++ libdap-3.18.1/tests/dmr-test.cc
+@@ -148,7 +148,7 @@ send_data(DMR *dataset, const string &co
+ // It's declared at this scope because we (may) need it for the code beyond the
+ // function parse/eval code that immediately follows. jhrg 3/12/14
+ D4TestTypeFactory d4_factory;
+- auto_ptr<DMR> function_result(new DMR(&d4_factory, "function_results"));
++ unique_ptr<DMR> function_result(new DMR(&d4_factory, "function_results"));
+
+ // The Function Parser
+ if (!function.empty()) {
+Index: libdap-3.18.1/unit-tests/HTTPCacheTest.cc
+===================================================================
+--- libdap-3.18.1.orig/unit-tests/HTTPCacheTest.cc
++++ libdap-3.18.1/unit-tests/HTTPCacheTest.cc
+@@ -543,7 +543,7 @@ public:
+ try {
+ delete hc;
+ hc = 0;
+- auto_ptr<HTTPCache> gc(new HTTPCache("cache-testsuite/gc_cache", true));
++ unique_ptr<HTTPCache> gc(new HTTPCache("cache-testsuite/gc_cache", true));
+ DBG(cerr << "get_cache_root: " << gc->get_cache_root() << endl);
+
+ HTTPResponse *rs = http_conn->fetch_url(localhost_url);
+@@ -575,7 +575,7 @@ public:
+ void purge_cache_and_release_cached_response_test()
+ {
+ try {
+- auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
++ unique_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
+ DBG(cerr << "get_cache_root: " << pc->get_cache_root() << endl);
+
+ time_t now = time(0);
+@@ -686,7 +686,7 @@ public:
+ void get_conditional_response_headers_test()
+ {
+ try {
+- auto_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/header_cache", true));
++ unique_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/header_cache", true));
+ DBG(cerr << "get_cache_root: " << c->get_cache_root() << endl);
+
+ CPPUNIT_ASSERT(c->get_cache_root() == "cache-testsuite/header_cache/");
+@@ -723,7 +723,7 @@ public:
+ void update_response_test()
+ {
+ try {
+- auto_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/singleton_cache", true));
++ unique_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/singleton_cache", true));
+ DBG(cerr << "get_cache_root: " << c->get_cache_root() << endl);
+
+ if (!c->is_url_in_cache(localhost_url)) {
+@@ -786,7 +786,7 @@ public:
+ void interrupt_test()
+ {
+ try {
+- auto_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/singleton_cache", true));
++ unique_ptr<HTTPCache> c(new HTTPCache("cache-testsuite/singleton_cache", true));
+ string coads = "http://test.opendap.org/dap/data/nc/coads_climatology.nc";
+ if (!c->is_url_in_cache(coads)) {
+ HTTPResponse *rs = http_conn->fetch_url(coads);
+@@ -807,7 +807,7 @@ public:
+ string jan = "http://test.opendap.org/dap/data/nc/jan.nc.dds";
+ string feb = "http://test.opendap.org/dap/data/nc/feb.nc.dds";
+ try {
+- auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
++ unique_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
+
+ CPPUNIT_ASSERT(pc->d_http_cache_table->d_block_size == 4096);
+
+@@ -855,7 +855,7 @@ public:
+ // performed. The feb URL should have been deleted.
+
+ try {
+- auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
++ unique_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
+ CPPUNIT_ASSERT(!pc->is_url_in_cache(feb));
+ }
+ catch (Error &e) {
+Index: libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
+===================================================================
+--- libdap-3.18.1.orig/unit-tests/D4FilterClauseTest.cc
++++ libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
+@@ -109,25 +109,25 @@ public:
+ D4RValue *arg1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ CPPUNIT_ASSERT(less->value(dmr));
+
+ D4RValue *arg2_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2_2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(!greater->value(dmr));
+
+ D4RValue *arg3_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg3_2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
++ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ CPPUNIT_ASSERT(!equal->value(dmr));
+
+ D4RValue *arg4_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg4_2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
++ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ CPPUNIT_ASSERT(not_equal->value(dmr));
+ }
+
+@@ -136,25 +136,25 @@ public:
+ D4RValue *arg1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ CPPUNIT_ASSERT(less->value());
+
+ D4RValue *arg2_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2_2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(!greater->value());
+
+ D4RValue *arg3_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg3_2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
++ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ CPPUNIT_ASSERT(!equal->value());
+
+ D4RValue *arg4_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg4_2 = new D4RValue((long long)21);
+
+- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
++ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ CPPUNIT_ASSERT(not_equal->value());
+ }
+
+@@ -162,25 +162,25 @@ public:
+ D4RValue *arg1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2 = new D4RValue((double)21.0);
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ CPPUNIT_ASSERT(less->value(dmr));
+
+ D4RValue *arg2_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2_2 = new D4RValue((double)21);
+
+- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(!greater->value(dmr));
+
+ D4RValue *arg3_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg3_2 = new D4RValue((double)21);
+
+- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
++ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ CPPUNIT_ASSERT(!equal->value(dmr));
+
+ D4RValue *arg4_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg4_2 = new D4RValue((double)21);
+
+- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
++ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ CPPUNIT_ASSERT(not_equal->value(dmr));
+ }
+
+@@ -191,7 +191,7 @@ public:
+ D4RValue *arg1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2 = new D4RValue((unsigned long long)(21));
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ CPPUNIT_ASSERT(less->value());
+
+ }
+@@ -200,7 +200,7 @@ public:
+ D4RValue *arg1 = new D4RValue(byte); // holds 17
+ D4RValue *arg2 = new D4RValue((float)21.0);
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ CPPUNIT_ASSERT(less->value());
+
+ }
+@@ -211,25 +211,25 @@ public:
+ D4RValue *arg1 = new D4RValue(str);
+ D4RValue *arg2 = new D4RValue(string("Tesla"));
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ CPPUNIT_ASSERT(less->value());
+
+ D4RValue *arg2_1 = new D4RValue(str);
+ D4RValue *arg2_2 = new D4RValue("Tesla");
+
+- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(!greater->value());
+
+ D4RValue *arg3_1 = new D4RValue(str);
+ D4RValue *arg3_2 = new D4RValue("Tesla");
+
+- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
++ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ CPPUNIT_ASSERT(!equal->value(dmr));
+
+ D4RValue *arg4_1 = new D4RValue(str);
+ D4RValue *arg4_2 = new D4RValue("Tesla");
+
+- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
++ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ CPPUNIT_ASSERT(not_equal->value(dmr));
+ }
+
+@@ -237,7 +237,7 @@ public:
+ D4RValue *arg1 = new D4RValue(str);
+ D4RValue *arg2 = new D4RValue(string("E.*n"));
+
+- auto_ptr<D4FilterClause> match(new D4FilterClause(D4FilterClause::match, arg1, arg2));
++ unique_ptr<D4FilterClause> match(new D4FilterClause(D4FilterClause::match, arg1, arg2));
+ CPPUNIT_ASSERT(match->value());
+ }
+
+@@ -247,7 +247,7 @@ public:
+ D4RValue *arg2 = new D4RValue((long long) 21);
+
+ try {
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ // The Filter Clause instance is built OK, but the value() method
+ // will balk at this comparison. jhrg 4/21/16
+ DBG(cerr << "built filter clause instance" << endl);
+@@ -267,7 +267,7 @@ public:
+ D4RValue *arg2 = new D4RValue("Tesla");
+
+ try {
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+ CPPUNIT_ASSERT(less->value());
+ CPPUNIT_FAIL("Expected error");
+@@ -280,13 +280,13 @@ public:
+
+ void Structure_and_string_error_test()
+ {
+- auto_ptr<Structure> s(new Structure("s"));
++ unique_ptr<Structure> s(new Structure("s"));
+ s->add_var(byte); // copy the object
+ D4RValue *arg1 = new D4RValue(s.get()); // BaseType*s are not free'd by D4RValue
+ D4RValue *arg2 = new D4RValue("Tesla");
+
+ try {
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+ CPPUNIT_ASSERT(less->value());
+ CPPUNIT_FAIL("Expected error");
+@@ -300,13 +300,13 @@ public:
+ // There's no way this will get past the parser, but ...
+ void Byte_and_Structure_error_test()
+ {
+- auto_ptr<Structure> s(new Structure("s"));
++ unique_ptr<Structure> s(new Structure("s"));
+ s->add_var(str); // copy the object
+ D4RValue *arg1 = new D4RValue(byte);
+ D4RValue *arg2 = new D4RValue(s.get());
+
+ try {
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+ CPPUNIT_ASSERT(less->value());
+ CPPUNIT_FAIL("Expected error");
+@@ -320,13 +320,13 @@ public:
+ // There's no way this will get past the parser, but ...
+ void Str_and_Structure_error_test()
+ {
+- auto_ptr<Structure> s(new Structure("s"));
++ unique_ptr<Structure> s(new Structure("s"));
+ s->add_var(str); // copy the object
+ D4RValue *arg1 = new D4RValue(str);
+ D4RValue *arg2 = new D4RValue(s.get());
+
+ try {
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+
+ CPPUNIT_ASSERT(less->value());
+ CPPUNIT_FAIL("Expected error");
+@@ -342,25 +342,25 @@ public:
+ D4RValue *arg2_1 = new D4RValue(f32);
+ D4RValue *arg2_2 = new D4RValue(17.0);
+
+- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(less->value());
+
+ D4RValue *arg3_1 = new D4RValue(url);
+ D4RValue *arg3_2 = new D4RValue("https://github.com/opendap");
+
+- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
++ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ CPPUNIT_ASSERT(equal->value(dmr));
+
+ D4RValue *arg4_1 = new D4RValue(url);
+ D4RValue *arg4_2 = new D4RValue("https://.*dap$");
+
+- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
++ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ CPPUNIT_ASSERT(not_equal->value(dmr));
+
+ D4RValue *arg5_1 = new D4RValue(url);
+ D4RValue *arg5_2 = new D4RValue("https://.*dap$");
+
+- auto_ptr<D4FilterClause> match(new D4FilterClause(D4FilterClause::match, arg5_1, arg5_2));
++ unique_ptr<D4FilterClause> match(new D4FilterClause(D4FilterClause::match, arg5_1, arg5_2));
+ CPPUNIT_ASSERT(match->value(dmr));
+ }
+
+@@ -368,7 +368,7 @@ public:
+ D4RValue *arg2_1 = new D4RValue(f32);
+ D4RValue *arg2_2 = new D4RValue(3.1415);
+
+- auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(clause->value());
+ }
+
+@@ -376,7 +376,7 @@ public:
+ D4RValue *arg2_1 = new D4RValue(f32);
+ D4RValue *arg2_2 = new D4RValue(3.1415);
+
+- auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::greater_equal, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::greater_equal, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(clause->value());
+ }
+
+@@ -384,24 +384,24 @@ public:
+ D4RValue *arg2_1 = new D4RValue(f32);
+ D4RValue *arg2_2 = new D4RValue(3.1415);
+
+- auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::less_equal, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::less_equal, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(clause->value());
+ }
+
+ void int_test() {
+- auto_ptr<Int8> i8(new Int8(""));
++ unique_ptr<Int8> i8(new Int8(""));
+ i8->set_value(17);
+ D4RValue *arg2_1 = new D4RValue(i8.get());
+ D4RValue *arg2_2 = new D4RValue((long long)17);
+
+- auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
+ CPPUNIT_ASSERT(clause->value());
+ }
+
+
+ void true_clauses_test() {
+ // Testing this as a pointer since that's how it will be stored in D4Sequence
+- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
++ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+ D4RValue *arg1_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg1_2 = new D4RValue((double)21.0);
+@@ -426,7 +426,7 @@ public:
+
+ // This should return true
+ void no_clauses_test() {
+- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
++ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+ CPPUNIT_ASSERT(clauses->size() == 0);
+ CPPUNIT_ASSERT(clauses->value(dmr));
+@@ -434,7 +434,7 @@ public:
+ }
+
+ void false_clauses_test() {
+- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
++ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+ D4RValue *arg1_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg1_2 = new D4RValue((double)21.0);
+@@ -459,7 +459,7 @@ public:
+ }
+
+ void evaluation_order_test() {
+- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
++ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+ D4RValue *arg1_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg1_2 = new D4RValue((double)21.0);
+@@ -492,7 +492,7 @@ public:
+ }
+
+ void evaluation_order_test_2() {
+- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
++ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+
+ D4RValue *arg1_1 = new D4RValue(byte); // holds 17
+ D4RValue *arg1_2 = new D4RValue((double)21.0);
+Index: libdap-3.18.1/unit-tests/D4SequenceTest.cc
+===================================================================
+--- libdap-3.18.1.orig/unit-tests/D4SequenceTest.cc
++++ libdap-3.18.1/unit-tests/D4SequenceTest.cc
+@@ -118,7 +118,7 @@ public:
+ }
+
+ void copy_ctor_test() {
+- auto_ptr<TestD4Sequence> ts(new TestD4Sequence(*s));
++ unique_ptr<TestD4Sequence> ts(new TestD4Sequence(*s));
+ ts->intern_data();
+
+ CPPUNIT_ASSERT(ts->length() == 7);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git
More information about the debian-science-commits
mailing list