From 528c56de01bbbd38788ed6cf8d2eea4c56cbe19e Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 30 Jul 2010 19:28:44 +0000 Subject: Move the number conversions from string_util to a new file. Use the base namespace in the new file. Update callers. I removed all wstring variants and also the string->number ones that ignore the return value. That encourages people to write code and forget about error handling. TEST=included unit tests BUG=none Review URL: http://codereview.chromium.org/3056029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54355 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/command_buffer/service/program_manager.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gpu') diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc index 81bab30..d9ad80e 100644 --- a/gpu/command_buffer/service/program_manager.cc +++ b/gpu/command_buffer/service/program_manager.cc @@ -3,11 +3,13 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/program_manager.h" + #include + #include "base/basictypes.h" #include "base/logging.h" #include "base/scoped_ptr.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" namespace gpu { @@ -227,7 +229,7 @@ const ProgramManager::ProgramInfo::UniformInfo* } } for (GLsizei ii = 1; ii < info.size; ++ii) { - std::string element_name(base_name + "[" + IntToString(ii) + "]"); + std::string element_name(base_name + "[" + base::IntToString(ii) + "]"); info.element_locations[ii] = glGetUniformLocation(service_id_, element_name.c_str()); } -- cgit v1.1