Remove CYValue<> as it is no longer at all useful.

diff --git a/Execute.cpp b/Execute.cpp
index 375facf5db70d13ee812bf21696fff3e57aaa9c3..f620f385c0457e10f432d213f09ebc61c35cd27b 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -238,14 +238,15 @@ struct Context :
 };
 
 struct CArray :
 };
 
 struct CArray :

-    CYValue<CArray, void *>
+    CYPrivate<CArray>

 {
 {

+    void *value_;

     CYProtect owner_;
     Type_privateData *type_;
     size_t length_;
 
     CArray(void *value, size_t length, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
     CYProtect owner_;
     Type_privateData *type_;
     size_t length_;
 
     CArray(void *value, size_t length, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :

-        CYValue(value),
+        value_(value),

         owner_(context, owner),
         type_(new(*pool_) Type_privateData(type, ffi)),
         length_(length)
         owner_(context, owner),
         type_(new(*pool_) Type_privateData(type, ffi)),
         length_(length)


@@ -260,12 +261,13 @@ struct CArray :
 };
 
 struct CString :
 };
 
 struct CString :

-    CYValue<CString, char *>
+    CYPrivate<CString>

 {
 {

+    char *value_;

     CYProtect owner_;
 
     CString(char *value, JSContextRef context, JSObjectRef owner) :
     CYProtect owner_;
 
     CString(char *value, JSContextRef context, JSObjectRef owner) :

-        CYValue(value),
+        value_(value),

         owner_(context, owner)
     {
         if (owner == NULL)
         owner_(context, owner)
     {
         if (owner == NULL)


@@ -274,20 +276,21 @@ struct CString :
 };
 
 struct Pointer :
 };
 
 struct Pointer :

-    CYValue<Pointer, void *>
+    CYPrivate<Pointer>

 {
 {

+    void *value_;

     CYProtect owner_;
     Type_privateData *type_;
 
     Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) :
     CYProtect owner_;
     Type_privateData *type_;
 
     Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) :

-        CYValue(value),
+        value_(value),

         owner_(context, owner),
         type_(new(*pool_) Type_privateData(type))
     {
     }
 
     Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) :
         owner_(context, owner),
         type_(new(*pool_) Type_privateData(type))
     {
     }
 
     Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) :

-        CYValue(value),
+        value_(value),

         owner_(context, owner),
         type_(new(*pool_) Type_privateData(encoding))
     {
         owner_(context, owner),
         type_(new(*pool_) Type_privateData(encoding))
     {


@@ -295,13 +298,14 @@ struct Pointer :
 };
 
 struct Struct_privateData :
 };
 
 struct Struct_privateData :

-    CYValue<Struct_privateData, void *>
+    CYPrivate<Struct_privateData>

 {
 {

+    void *value_;

     CYProtect owner_;
     Type_privateData *type_;
 
     Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
     CYProtect owner_;
     Type_privateData *type_;
 
     Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :

-        CYValue(value),
+        value_(value),

         owner_(context, owner),
         type_(new(*pool_) Type_privateData(type, ffi))
     {
         owner_(context, owner),
         type_(new(*pool_) Type_privateData(type, ffi))
     {

diff --git a/Internal.hpp b/Internal.hpp
index 464fe936d1782e8038cafa4a36f12e80f1e25b62..b4acd1871de7dfd158f8439680263d1cacf49f94 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -117,26 +117,6 @@ struct Type_privateData :
     }
 };
 
     }
 };
 

-template <typename Internal_, typename Value_>
-struct CYValue :
-    CYPrivate<Internal_>
-{
-    Value_ value_;
-
-    CYValue() {
-    }
-
-    CYValue(const Value_ &value) :
-        value_(value)
-    {
-    }
-
-    CYValue(const CYValue &rhs) :
-        value_(rhs.value_)
-    {
-    }
-};
-

 template <typename Internal_>
 JSClassRef CYPrivate<Internal_>::Class_;
 
 template <typename Internal_>
 JSClassRef CYPrivate<Internal_>::Class_;
 


@@ -176,7 +156,7 @@ struct CYProtect {
 
 namespace cy {
 struct Functor :
 
 namespace cy {
 struct Functor :

-    CYValue<Functor, void (*)()>
+    CYPrivate<Functor>

 {
   private:
     void set() {
 {
   private:
     void set() {


@@ -184,12 +164,13 @@ struct Functor :
     }
 
   public:
     }
 
   public:

+    void (*value_)();

     bool variadic_;
     sig::Signature signature_;
     ffi_cif cif_;
 
     Functor(void (*value)(), bool variadic, const sig::Signature &signature) :
     bool variadic_;
     sig::Signature signature_;
     ffi_cif cif_;
 
     Functor(void (*value)(), bool variadic, const sig::Signature &signature) :

-        CYValue(value),
+        value_(value),

         variadic_(variadic)
     {
         sig::Copy(*pool_, signature_, signature);
         variadic_(variadic)
     {
         sig::Copy(*pool_, signature_, signature);


@@ -197,7 +178,7 @@ struct Functor :
     }
 
     Functor(void (*value)(), const char *encoding) :
     }
 
     Functor(void (*value)(), const char *encoding) :

-        CYValue(value),
+        value_(value),

         variadic_(false)
     {
         sig::Parse(*pool_, &signature_, encoding, &Structor_);
         variadic_(false)
     {
         sig::Parse(*pool_, &signature_, encoding, &Structor_);

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index deb5e5df07df64ae47657b0e686bd52094bc7e71..356f61bbdfe3bd6e20f982c1e59153b709c12a72 100644 (file)
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/Internal.hpp
@@ -27,22 +27,25 @@
 #include "../Internal.hpp"
 
 struct Selector_privateData :
 #include "../Internal.hpp"
 
 struct Selector_privateData :

-    CYValue<Selector_privateData, SEL>
+    CYPrivate<Selector_privateData>

 {
 {

+    SEL value_;
+

     _finline Selector_privateData(SEL value) :
     _finline Selector_privateData(SEL value) :

-        CYValue(value)
+        value_(value)

     {
     }
 };
 
 struct Instance :
     {
     }
 };
 
 struct Instance :

-    CYValue<Instance, id>
+    CYPrivate<Instance>

 {
     typedef unsigned Flags;
     static const Flags None = 0;
     static const Flags Permanent = 1 << 0;
     static const Flags Uninitialized = 1 << 1;
 
 {
     typedef unsigned Flags;
     static const Flags None = 0;
     static const Flags Permanent = 1 << 0;
     static const Flags Uninitialized = 1 << 1;
 

+    id value_;

     Flags flags_;
 
     Instance(id value, Flags flags);
     Flags flags_;
 
     Instance(id value, Flags flags);


@@ -63,22 +66,25 @@ struct Instance :
 
 namespace cy {
 struct Super :
 
 namespace cy {
 struct Super :

-    CYValue<Super, id>
+    CYPrivate<Super>

 {
 {

+    id value_;

     Class class_;
 
     _finline Super(id value, Class _class) :
     Class class_;
 
     _finline Super(id value, Class _class) :

-        CYValue(value),
+        value_(value),

         class_(_class)
     {
     }
 }; }
 
 struct Messages :
         class_(_class)
     {
     }
 }; }
 
 struct Messages :

-    CYValue<Messages, Class>
+    CYPrivate<Messages>

 {
 {

+    Class value_;
+

     _finline Messages(Class value) :
     _finline Messages(Class value) :

-        CYValue(value)
+        value_(value)

     {
     }
 
     {
     }
 


@@ -86,12 +92,13 @@ struct Messages :
 };
 
 struct Interior :
 };
 
 struct Interior :

-    CYValue<Interior, id>
+    CYPrivate<Interior>

 {
 {

+    id value_;

     CYProtect owner_;
 
     _finline Interior(id value, JSContextRef context, JSObjectRef owner) :
     CYProtect owner_;
 
     _finline Interior(id value, JSContextRef context, JSObjectRef owner) :

-        CYValue(value),
+        value_(value),

         owner_(context, owner)
     {
     }
         owner_(context, owner)
     {
     }

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 23091450b504800ec96d392199d9aa3790be8ec0..6f7c0e6db826fcefd82cacbb5b9055a71f4cab29 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -350,7 +350,7 @@ JSClassRef Instance::GetClass(id object, Flags flags) {
 }
 
 Instance::Instance(id value, Flags flags) :
 }
 
 Instance::Instance(id value, Flags flags) :

-    CYValue(value),
+    value_(value),

     flags_(flags)
 {
     if (IsPermanent());
     flags_(flags)
 {
     if (IsPermanent());