mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 16:40:38 +08:00
Replace scoped_ptr with C++11's unique_ptr
Change-Id: Ib5a504c491e3a79af52a95accf009df473470c6b
This commit is contained in:
@@ -31,15 +31,16 @@
|
||||
#ifndef CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DIAGONAL_MATRIX_H_
|
||||
#define CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DIAGONAL_MATRIX_H_
|
||||
|
||||
#include <memory>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "ceres/block_random_access_matrix.h"
|
||||
#include "ceres/triplet_sparse_matrix.h"
|
||||
#include "ceres/integral_types.h"
|
||||
#include "ceres/internal/macros.h"
|
||||
#include "ceres/internal/port.h"
|
||||
#include "ceres/internal/scoped_ptr.h"
|
||||
#include "ceres/triplet_sparse_matrix.h"
|
||||
#include "ceres/types.h"
|
||||
|
||||
namespace ceres {
|
||||
@@ -87,7 +88,7 @@ class BlockRandomAccessDiagonalMatrix : public BlockRandomAccessMatrix {
|
||||
std::vector<CellInfo*> layout_;
|
||||
|
||||
// The underlying matrix object which actually stores the cells.
|
||||
scoped_ptr<TripletSparseMatrix> tsm_;
|
||||
std::unique_ptr<TripletSparseMatrix> tsm_;
|
||||
|
||||
friend class BlockRandomAccessDiagonalMatrixTest;
|
||||
CERES_DISALLOW_COPY_AND_ASSIGN(BlockRandomAccessDiagonalMatrix);
|
||||
|
||||
Reference in New Issue
Block a user