@@ -95,76 +95,12 @@ using v8::Object;
9595using v8::String;
9696using v8::Value;
9797
98- <<<<<<< HEAD
99- #define TYPE_ERROR (msg ) env->ThrowTypeError (msg)
100-
101- #define GET_OFFSET (a ) ((a)->IsNumber () ? (a)->IntegerValue() : -1)
102-
103- #define ASSERT_PATH (path ) \
104- if (*path == nullptr ) \
105- return TYPE_ERROR( #path " must be a string or Buffer" );
106- =======
10798#ifndef MIN
10899# define MIN (a, b ) ((a) < (b) ? (a) : (b))
109100#endif
110101
111102#define GET_OFFSET (a ) ((a)->IsNumber () ? (a)->IntegerValue() : -1)
112103
113- class FSReqWrap: public ReqWrap<uv_fs_t> {
114- public:
115- enum Ownership { COPY, MOVE };
116-
117- inline static FSReqWrap* New (Environment* env,
118- Local<Object> req,
119- const char * syscall,
120- const char * data = nullptr ,
121- enum encoding encoding = UTF8,
122- Ownership ownership = COPY);
123-
124- inline void Dispose ();
125-
126- void ReleaseEarly () {
127- if (data_ != inline_data ()) {
128- delete[] data_;
129- data_ = nullptr ;
130- }
131- }
132-
133- const char * syscall () const { return syscall_; }
134- const char * data () const { return data_; }
135- const enum encoding encoding_;
136-
137- size_t self_size () const override { return sizeof (*this ); }
138-
139- private:
140- FSReqWrap (Environment* env,
141- Local<Object> req,
142- const char * syscall,
143- const char * data,
144- enum encoding encoding)
145- : ReqWrap (env, req, AsyncWrap::PROVIDER_FSREQWRAP),
146- encoding_ (encoding),
147- syscall_ (syscall),
148- data_ (data) {
149- Wrap (object (), this );
150- }
151-
152- ~FSReqWrap () {
153- ReleaseEarly ();
154- ClearWrap (object ());
155- }
156-
157- void * operator new (size_t size) = delete ;
158- void * operator new (size_t size, char * storage) { return storage; }
159- char * inline_data () { return reinterpret_cast <char *>(this + 1 ); }
160-
161- const char * syscall_;
162- const char * data_;
163-
164- DISALLOW_COPY_AND_ASSIGN (FSReqWrap);
165- };
166- >>>>>>> fs: remove now unnecessary macros
167-
168104FSReqWrap* FSReqWrap::New(Environment* env,
169105 Local<Object> req,
170106 const char * syscall,
0 commit comments