diff options
Diffstat (limited to 'o3d')
33 files changed, 33 insertions, 33 deletions
diff --git a/o3d/converter/cross/buffer_stub.h b/o3d/converter/cross/buffer_stub.h index 26c0aad..9d163c3 100644 --- a/o3d/converter/cross/buffer_stub.h +++ b/o3d/converter/cross/buffer_stub.h @@ -37,7 +37,7 @@ #define O3D_CONVERTER_CROSS_BUFFER_STUB_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/buffer.h" namespace o3d { diff --git a/o3d/converter/cross/converter.cc b/o3d/converter/cross/converter.cc index 68969f2..1dcd775 100644 --- a/o3d/converter/cross/converter.cc +++ b/o3d/converter/cross/converter.cc @@ -36,7 +36,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "converter/cross/renderer_stub.h" #include "core/cross/class_manager.h" #include "core/cross/client.h" diff --git a/o3d/converter_edge/cross/buffer_stub.h b/o3d/converter_edge/cross/buffer_stub.h index d1da197..2e64131 100644 --- a/o3d/converter_edge/cross/buffer_stub.h +++ b/o3d/converter_edge/cross/buffer_stub.h @@ -37,7 +37,7 @@ #define O3D_CONVERTER_EDGE_CROSS_BUFFER_STUB_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/buffer.h" namespace o3d { diff --git a/o3d/converter_edge/cross/converter.cc b/o3d/converter_edge/cross/converter.cc index 8936213..b1ca4dd 100644 --- a/o3d/converter_edge/cross/converter.cc +++ b/o3d/converter_edge/cross/converter.cc @@ -40,7 +40,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/class_manager.h" #include "core/cross/client.h" #include "core/cross/client_info.h" diff --git a/o3d/core/cross/buffer.h b/o3d/core/cross/buffer.h index 79f5b1f..8a75b99 100644 --- a/o3d/core/cross/buffer.h +++ b/o3d/core/cross/buffer.h @@ -37,10 +37,10 @@ #define O3D_CORE_CROSS_BUFFER_H_ #include <vector> +#include "base/memory/scoped_ptr.h" #include "core/cross/field.h" #include "core/cross/named_object.h" #include "core/cross/types.h" -#include "base/scoped_ptr.h" namespace o3d { diff --git a/o3d/core/cross/canvas_shader.cc b/o3d/core/cross/canvas_shader.cc index 7f55fcb..5601eb1 100644 --- a/o3d/core/cross/canvas_shader.cc +++ b/o3d/core/cross/canvas_shader.cc @@ -32,8 +32,8 @@ // This file contains the implementation for the CanvasShader class. +#include "base/memory/scoped_ptr.h" #include "core/cross/canvas_shader.h" -#include "base/scoped_ptr.h" #include "core/cross/canvas_utils.h" #include "core/cross/error.h" diff --git a/o3d/core/cross/client.h b/o3d/core/cross/client.h index 19cc45e..920a746 100644 --- a/o3d/core/cross/client.h +++ b/o3d/core/cross/client.h @@ -44,7 +44,7 @@ #include <vector> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/service_dependency.h" #include "core/cross/error_status.h" #include "core/cross/draw_list_manager.h" diff --git a/o3d/core/cross/file_request.h b/o3d/core/cross/file_request.h index 11e695d9..8d500b4 100644 --- a/o3d/core/cross/file_request.h +++ b/o3d/core/cross/file_request.h @@ -38,7 +38,7 @@ #include <algorithm> #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/callback.h" #include "core/cross/object_base.h" #include "core/cross/pack.h" diff --git a/o3d/core/cross/gles2/buffer_gles2.h b/o3d/core/cross/gles2/buffer_gles2.h index b1956f8..cdae8f9 100644 --- a/o3d/core/cross/gles2/buffer_gles2.h +++ b/o3d/core/cross/gles2/buffer_gles2.h @@ -36,7 +36,7 @@ #ifndef O3D_CORE_CROSS_GLES2_BUFFER_GLES2_H_ #define O3D_CORE_CROSS_GLES2_BUFFER_GLES2_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/buffer.h" #include "core/cross/gles2/gles2_headers.h" diff --git a/o3d/core/cross/gpu2d/arena_test.cc b/o3d/core/cross/gpu2d/arena_test.cc index 0c34bbf..eea806e 100644 --- a/o3d/core/cross/gpu2d/arena_test.cc +++ b/o3d/core/cross/gpu2d/arena_test.cc @@ -34,7 +34,7 @@ #include <algorithm> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/gpu2d/arena.h" #include "gtest/gtest.h" diff --git a/o3d/core/cross/param.h b/o3d/core/cross/param.h index ee0a0ec..3d954ae 100644 --- a/o3d/core/cross/param.h +++ b/o3d/core/cross/param.h @@ -36,7 +36,7 @@ #define O3D_CORE_CROSS_PARAM_H_ #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/named_object.h" #include "core/cross/types.h" #include "core/cross/weak_ptr.h" diff --git a/o3d/core/win/d3d9/buffer_d3d9.h b/o3d/core/win/d3d9/buffer_d3d9.h index 89c499e..0bf9611 100644 --- a/o3d/core/win/d3d9/buffer_d3d9.h +++ b/o3d/core/win/d3d9/buffer_d3d9.h @@ -37,7 +37,7 @@ #include <d3d9.h> #include <atlbase.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/buffer.h" namespace o3d { diff --git a/o3d/core/win/d3d9/effect_d3d9.cc b/o3d/core/win/d3d9/effect_d3d9.cc index 057c55e..5862f27 100644 --- a/o3d/core/win/d3d9/effect_d3d9.cc +++ b/o3d/core/win/d3d9/effect_d3d9.cc @@ -38,7 +38,7 @@ #include "core/win/d3d9/effect_d3d9.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/core_metrics.h" #include "core/cross/error.h" #include "core/cross/material.h" diff --git a/o3d/core/win/d3d9/install_check.cc b/o3d/core/win/d3d9/install_check.cc index dce002e..e667ebc 100644 --- a/o3d/core/win/d3d9/install_check.cc +++ b/o3d/core/win/d3d9/install_check.cc @@ -41,7 +41,7 @@ #include <sstream> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/win/d3d9/d3d_entry_points.h" EXTERN_C IMAGE_DOS_HEADER __ImageBase; diff --git a/o3d/import/cross/archive_request.h b/o3d/import/cross/archive_request.h index 980c449..801b47a 100644 --- a/o3d/import/cross/archive_request.h +++ b/o3d/import/cross/archive_request.h @@ -38,7 +38,7 @@ #include <algorithm> #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/callback.h" #include "core/cross/object_base.h" #include "core/cross/pack.h" diff --git a/o3d/import/cross/raw_data.h b/o3d/import/cross/raw_data.h index 9f433cc..e479d20 100644 --- a/o3d/import/cross/raw_data.h +++ b/o3d/import/cross/raw_data.h @@ -39,7 +39,7 @@ #ifndef O3D_IMPORT_CROSS_RAW_DATA_H_ #define O3D_IMPORT_CROSS_RAW_DATA_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/param_object.h" namespace o3d { diff --git a/o3d/plugin/cross/main_remote_cb.cc b/o3d/plugin/cross/main_remote_cb.cc index e2346ed..c81351e 100644 --- a/o3d/plugin/cross/main_remote_cb.cc +++ b/o3d/plugin/cross/main_remote_cb.cc @@ -36,7 +36,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/command_buffer/renderer_cb.h" #include "core/cross/command_buffer/display_window_cb.h" #include "gpu_plugin/command_buffer.h" diff --git a/o3d/plugin/cross/np_v8_bridge.cc b/o3d/plugin/cross/np_v8_bridge.cc index ced02d2..d90639f 100644 --- a/o3d/plugin/cross/np_v8_bridge.cc +++ b/o3d/plugin/cross/np_v8_bridge.cc @@ -37,7 +37,7 @@ #include <npapi.h> #include <sstream> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "plugin/cross/np_v8_bridge.h" using v8::AccessorInfo; diff --git a/o3d/plugin/cross/o3d_glue.h b/o3d/plugin/cross/o3d_glue.h index 79cdcd9..394bec4 100644 --- a/o3d/plugin/cross/o3d_glue.h +++ b/o3d/plugin/cross/o3d_glue.h @@ -52,8 +52,8 @@ #include <set> #include <string> #include <vector> -#include "base/scoped_ptr.h" #include "base/hash_tables.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/bitmap.h" #include "core/cross/display_mode.h" #include "core/cross/display_window.h" diff --git a/o3d/plugin/cross/plugin_logging.h b/o3d/plugin/cross/plugin_logging.h index 7997cb4..1a4af1d 100644 --- a/o3d/plugin/cross/plugin_logging.h +++ b/o3d/plugin/cross/plugin_logging.h @@ -38,9 +38,9 @@ #ifndef O3D_PLUGIN_CROSS_PLUGIN_LOGGING_H_ #define O3D_PLUGIN_CROSS_PLUGIN_LOGGING_H_ +#include "base/memory/scoped_ptr.h" #include "statsreport/metrics.h" #include "statsreport/common/highres_timer.h" -#include "base/scoped_ptr.h" #include "base/basictypes.h" namespace o3d { diff --git a/o3d/plugin/cross/stream_manager.h b/o3d/plugin/cross/stream_manager.h index f7c6723..f636dc4 100644 --- a/o3d/plugin/cross/stream_manager.h +++ b/o3d/plugin/cross/stream_manager.h @@ -36,7 +36,7 @@ #include <npapi.h> #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "core/cross/callback.h" #include "plugin/cross/download_stream.h" diff --git a/o3d/plugin/mac/fullscreen_window_mac.h b/o3d/plugin/mac/fullscreen_window_mac.h index 61cd840..782c7fc 100644 --- a/o3d/plugin/mac/fullscreen_window_mac.h +++ b/o3d/plugin/mac/fullscreen_window_mac.h @@ -35,7 +35,7 @@ #include <OpenGL/OpenGL.h> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "plugin/mac/overlay_window_mac.h" diff --git a/o3d/plugin/mac/fullscreen_window_mac.mm b/o3d/plugin/mac/fullscreen_window_mac.mm index cc5f26d..2781d29 100644 --- a/o3d/plugin/mac/fullscreen_window_mac.mm +++ b/o3d/plugin/mac/fullscreen_window_mac.mm @@ -40,7 +40,7 @@ #import "plugin_mac.h" #import "base/cocoa_protocols_mac.h" #import "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "core/cross/display_mode.h" #import "plugin/cross/o3d_glue.h" #import "plugin/mac/graphics_utils_mac.h" diff --git a/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc b/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc index 64c8c23..dd435d7 100644 --- a/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc @@ -36,7 +36,7 @@ #include <dispex.h> #include <oaidl.h> -#include <base/scoped_ptr.h> +#include <base/memory/scoped_ptr.h> #include <algorithm> #include <vector> diff --git a/o3d/plugin/npapi_host_control/win/host_control.h b/o3d/plugin/npapi_host_control/win/host_control.h index 9a4fc68..d6a0382 100644 --- a/o3d/plugin/npapi_host_control/win/host_control.h +++ b/o3d/plugin/npapi_host_control/win/host_control.h @@ -49,7 +49,7 @@ #include <dispex.h> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" // Directory not included, as this file is auto-generated from the // type library. diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc index b70b02b..5183f45 100644 --- a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc @@ -34,7 +34,7 @@ #include <atlstr.h> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "plugin/npapi_host_control/win/np_object_proxy.h" #include "plugin/npapi_host_control/win/np_browser_proxy.h" #include "plugin/npapi_host_control/win/variant_utils.h" diff --git a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc index 5404c5f..df0c037 100644 --- a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc @@ -36,7 +36,7 @@ #include <shlwapi.h> #include <algorithm> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "plugin/npapi_host_control/win/module.h" #include "plugin/npapi_host_control/win/np_browser_proxy.h" #include "plugin/npapi_host_control/win/np_object_proxy.h" diff --git a/o3d/plugin/npapi_host_control/win/variant_utils.cc b/o3d/plugin/npapi_host_control/win/variant_utils.cc index cdd9499..1e4fd1f 100644 --- a/o3d/plugin/npapi_host_control/win/variant_utils.cc +++ b/o3d/plugin/npapi_host_control/win/variant_utils.cc @@ -30,8 +30,8 @@ */ +#include "base/memory/scoped_ptr.h" #include "plugin/npapi_host_control/win/variant_utils.h" -#include "base/scoped_ptr.h" #include "plugin/npapi_host_control/win/dispatch_proxy.h" void VariantToNPVariant(NPBrowserProxy* browser_proxy, diff --git a/o3d/statsreport/aggregator-mac.h b/o3d/statsreport/aggregator-mac.h index 046e10f..3b163d9 100644 --- a/o3d/statsreport/aggregator-mac.h +++ b/o3d/statsreport/aggregator-mac.h @@ -39,8 +39,8 @@ #include <Cocoa/Cocoa.h> #include <string> +#include "base/memory/scoped_ptr.h" #include "statsreport/aggregator.h" -#include "base/scoped_ptr.h" namespace stats_report { diff --git a/o3d/statsreport/aggregator-posix.h b/o3d/statsreport/aggregator-posix.h index 10117a4..43a2fe0 100644 --- a/o3d/statsreport/aggregator-posix.h +++ b/o3d/statsreport/aggregator-posix.h @@ -38,8 +38,8 @@ #include <string> #include "aggregator.h" -#include "base/scoped_ptr.h" #include "backend/keyvaluetable.h" +#include "base/memory/scoped_ptr.h" namespace stats_report { diff --git a/o3d/statsreport/persistent_iterator-win32.h b/o3d/statsreport/persistent_iterator-win32.h index ceaf851..e40f053 100644 --- a/o3d/statsreport/persistent_iterator-win32.h +++ b/o3d/statsreport/persistent_iterator-win32.h @@ -37,7 +37,7 @@ #include <atlbase.h> #include <atlstr.h> #include <iterator> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "metrics.h" #include "const-win32.h" diff --git a/o3d/utils/cross/dataurl.h b/o3d/utils/cross/dataurl.h index c403388..50c0cbe 100644 --- a/o3d/utils/cross/dataurl.h +++ b/o3d/utils/cross/dataurl.h @@ -34,8 +34,8 @@ #ifndef O3D_UTILS_CROSS_DATAURL_H_ #define O3D_UTILS_CROSS_DATAURL_H_ +#include "base/memory/scoped_ptr.h" #include "core/cross/types.h" -#include "base/scoped_ptr.h" namespace o3d { namespace dataurl { diff --git a/o3d/utils/cross/file_text_reader.cc b/o3d/utils/cross/file_text_reader.cc index 314be5e..9bc4a1e 100644 --- a/o3d/utils/cross/file_text_reader.cc +++ b/o3d/utils/cross/file_text_reader.cc @@ -38,7 +38,7 @@ #include <stdio.h> #include <sys/stat.h> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace o3d { |