← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/ha_archive.cc

  • Committer: Monty Taylor
  • Date: 2010-11-08 18:26:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: mordred@inaugust.com-20101108182608-lci86acl7r53sbi3
Replaced auto_ptr with scoped_ptr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/ha_archive.cc
19
19
 
20
20
#include "plugin/archive/archive_engine.h"
21
21
#include <memory>
 
22
#include <boost/scoped_ptr.hpp>
22
23
 
23
24
using namespace std;
24
25
using namespace drizzled;
165
166
    error= EEXIST;
166
167
 
167
168
  {
168
 
    auto_ptr<azio_stream> proto_stream(new azio_stream);
 
169
    boost::scoped_ptr<azio_stream> proto_stream(new azio_stream);
169
170
    char* proto_string;
170
171
    if (azopen(proto_stream.get(), proto_path.c_str(), O_RDONLY, AZ_METHOD_BLOCK) == 0)
171
172
      return HA_ERR_CRASHED_ON_USAGE;
260
261
 
261
262
bool ArchiveShare::prime(uint64_t *auto_increment)
262
263
{
263
 
  auto_ptr<azio_stream> archive_tmp(new azio_stream);
 
264
  boost::scoped_ptr<azio_stream> archive_tmp(new azio_stream);
264
265
 
265
266
  /*
266
267
    We read the meta file, but do not mark it dirty. Since we are not
502
503
                                 drizzled::message::Table& proto)
503
504
{
504
505
  int error= 0;
505
 
  auto_ptr<azio_stream> create_stream(new azio_stream);
 
506
  boost::scoped_ptr<azio_stream> create_stream(new azio_stream);
506
507
  uint64_t auto_increment_value;
507
508
  string serialized_proto;
508
509
 
950
951
int ha_archive::optimize()
951
952
{
952
953
  int rc= 0;
953
 
  auto_ptr<azio_stream> writer(new azio_stream);
 
954
  boost::scoped_ptr<azio_stream> writer(new azio_stream);
954
955
 
955
956
  init_archive_reader();
956
957