always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scoped_ptr -> unique_ptr

Browse Source
This commit is contained in:
lperron@google.com
2013-12-12 14:43:57 +00:00
parent 981f0be4dd
commit fa476a4d86
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/cpp/parse_dimacs_assignment.h
View File

@@ -21,6 +21,7 @@
#include <algorithm>
#include <cstdio>
#include <cstring>
#include "base/unique_ptr.h"
#include <string>
#include "base/callback.h"
@@ -89,7 +90,7 @@ template <typename GraphType> class DimacsAssignmentParser {
const char* reason;
NodeIndex num_left_nodes;
ArcIndex num_arcs;
scoped_ptr<string> bad_line;
std::unique_ptr<string> bad_line;
};
ErrorTrackingState state_;
@@ -288,7 +289,7 @@ LinearSumAssignment<GraphType>* DimacsAssignmentParser<GraphType>::Parse(
*error_message = "empty graph description";
return NULL;
}
scoped_ptr<PermutationCycleHandler<ArcIndex> > cycle_handler(
std::unique_ptr<PermutationCycleHandler<ArcIndex> > cycle_handler(
assignment_->ArcAnnotationCycleHandler());
GraphType* graph = graph_builder_->Graph(cycle_handler.get());
if (graph == NULL) {