JavaScriptCore-721.26.tar.gz

[apple/javascriptcore.git] / wtf / VectorTraits.h

diff --git a/wtf/VectorTraits.h b/wtf/VectorTraits.h
index c62a0bfaddd57a8c5ba1470091bf247e975966b0..3f33b290d97c6055265241c3d524069562c04dd7 100644 (file)
--- a/wtf/VectorTraits.h
+++ b/wtf/VectorTraits.h
@@ -1,7 +1,5 @@
-// -*- mode: c++; c-basic-offset: 4 -*-

 /*
 /*

- * This file is part of the KDE libraries
- * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public


@@ -23,33 +21,18 @@
 #ifndef WTF_VectorTraits_h
 #define WTF_VectorTraits_h
 
 #ifndef WTF_VectorTraits_h
 #define WTF_VectorTraits_h
 

+#include "OwnPtr.h"

 #include "RefPtr.h"
 #include "RefPtr.h"

+#include "TypeTraits.h"

 #include <utility>
 #include <utility>

+#include <memory>

 
 using std::pair;
 
 namespace WTF {
 
 
 using std::pair;
 
 namespace WTF {
 

-    template <typename T> struct IsPod           { static const bool value = false; };
-    template <> struct IsPod<bool>               { static const bool value = true; };
-    template <> struct IsPod<char>               { static const bool value = true; };
-    template <> struct IsPod<signed char>        { static const bool value = true; };
-    template <> struct IsPod<unsigned char>      { static const bool value = true; };
-    template <> struct IsPod<short>              { static const bool value = true; };
-    template <> struct IsPod<unsigned short>     { static const bool value = true; };
-    template <> struct IsPod<int>                { static const bool value = true; };
-    template <> struct IsPod<unsigned int>       { static const bool value = true; };
-    template <> struct IsPod<long>               { static const bool value = true; };
-    template <> struct IsPod<unsigned long>      { static const bool value = true; };
-    template <> struct IsPod<long long>          { static const bool value = true; };
-    template <> struct IsPod<unsigned long long> { static const bool value = true; };
-    template <> struct IsPod<float>              { static const bool value = true; };
-    template <> struct IsPod<double>             { static const bool value = true; };
-    template <> struct IsPod<long double>        { static const bool value = true; };
-    template <typename P> struct IsPod<P *>      { static const bool value = true; };
-

     template<bool isPod, typename T>
     template<bool isPod, typename T>

-    class VectorTraitsBase;
+    struct VectorTraitsBase;

 
     template<typename T>
     struct VectorTraitsBase<false, T>
 
     template<typename T>
     struct VectorTraitsBase<false, T>


@@ -89,11 +72,14 @@ namespace WTF {
         static const bool canCompareWithMemcmp = true;
     };
 
         static const bool canCompareWithMemcmp = true;
     };
 

-    // we know RefPtr is simple enough that initializing to 0 and moving with memcpy
+    // we know OwnPtr and RefPtr are simple enough that initializing to 0 and moving with memcpy

     // (and then not destructing the original) will totally work
     template<typename P>
     struct VectorTraits<RefPtr<P> > : SimpleClassVectorTraits { };
     // (and then not destructing the original) will totally work
     template<typename P>
     struct VectorTraits<RefPtr<P> > : SimpleClassVectorTraits { };

-    
+
+    template<typename P>
+    struct VectorTraits<OwnPtr<P> > : SimpleClassVectorTraits { };
+

     template<typename First, typename Second>
     struct VectorTraits<pair<First, Second> >
     {
     template<typename First, typename Second>
     struct VectorTraits<pair<First, Second> >
     {