summaryrefslogtreecommitdiffstats
path: root/o3d/core
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 22:19:59 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 22:19:59 +0000
commitb1ee1c29f6b7aa7c2b15d590862c333960c8654b (patch)
tree942f9f302d819d2b3842b9e99463e7f2d158aae6 /o3d/core
parent0f348aebf569c6acd4cf82b5954096e96458eb50 (diff)
downloadchromium_src-b1ee1c29f6b7aa7c2b15d590862c333960c8654b.zip
chromium_src-b1ee1c29f6b7aa7c2b15d590862c333960c8654b.tar.gz
chromium_src-b1ee1c29f6b7aa7c2b15d590862c333960c8654b.tar.bz2
Updated O3D to work with most recent Chrome base.
Added build.scons for Chrome IPC. Review URL: http://codereview.chromium.org/160616 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
-rw-r--r--o3d/core/cross/types.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/o3d/core/cross/types.h b/o3d/core/cross/types.h
index f7b817e..23e6609 100644
--- a/o3d/core/cross/types.h
+++ b/o3d/core/cross/types.h
@@ -105,12 +105,6 @@
// We can add more sophisticated per-platform #defines as necessary here
#define IS_LITTLE_ENDIAN 1
-#if defined(GYP_BUILD)
-// We only need this in the gyp build because we're using the current
-// chrome/base, which doesn't have down_cast in it anymore.
-// TODO(gspencer): Remove this #ifdef when we are moved fully over to
-// gyp.
-
// When you upcast (that is, cast a pointer from type Foo to type
// SuperclassOfFoo), it's fine to use implicit_cast<>, since upcasts
// always succeed. When you downcast (that is, cast a pointer from
@@ -137,7 +131,6 @@ inline To down_cast(From* f) { // Defined as From* so we only accept pointers.
return static_cast<To>(f);
}
-#endif // GYP_BUILD
namespace o3d {