These files were meant to be checked in with ...

core/cross/buffer.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 473 matching lines @@
   Renderer* renderer = service_locator->GetService<Renderer>();
   if (NULL == renderer) {
     O3D_ERROR(service_locator) << "No Render Device Available";
     return ObjectBase::Ref();
   }
   return ObjectBase::Ref(renderer->CreateVertexBuffer());
 }
 
 SourceBuffer::SourceBuffer(ServiceLocator* service_locator)
     : VertexBufferBase(service_locator),
-      buffer_(NULL) {
+      buffer_() {
 }
 
 SourceBuffer::~SourceBuffer() {
   ConcreteFree();
 }
 
 void SourceBuffer::ConcreteFree() {
-  if (buffer_) {
-    delete [] buffer_;
-    buffer_ = NULL;
-  }
+  buffer_.reset();
 }
 
 bool SourceBuffer::ConcreteAllocate(size_t size_in_bytes) {
   ConcreteFree();
 
-  buffer_ = new char[size_in_bytes];
+  buffer_.reset(new char[size_in_bytes]);
 
   return true;
 }
 
 bool SourceBuffer::ConcreteLock(AccessMode access_mode, void **buffer_data) {
-  if (!buffer_) {
+  if (!buffer_.get()) {
     return false;
   }
 
-  *buffer_data = reinterpret_cast<void*>(buffer_);
+  *buffer_data = reinterpret_cast<void*>(buffer_.get());
   return true;
 }
 
 bool SourceBuffer::ConcreteUnlock() {
-  return buffer_ != NULL;
+  return buffer_.get() != NULL;
 }
 
 ObjectBase::Ref SourceBuffer::Create(ServiceLocator* service_locator) {
   return ObjectBase::Ref(new SourceBuffer(service_locator));
 }
 
 Field* IndexBuffer::index_field() const {
   // TODO: It does not make sense for an IndexBuffer to have more
   // than one field. For example, we do not support any way of rendering a
   // primitive using only one of the fields of an IndexBuffer. The API allows
@@ skipping 39 matching lines @@
     locked_ = buffer_->Lock(access_mode, &data_);
     if (!locked_) {
       O3D_ERROR(buffer_->service_locator())
           << "Unable to lock buffer '" << buffer_->name() << "'";
     }
   }
   return data_;
 }
 
 }  // namespace o3d