fix m-alloc error

maxkorp · maxkorp · commit ded20afb1b65 · 2014-11-07T15:43:01.000-07:00
diff --git a/generate/templates/class_content.cc b/generate/templates/class_content.cc
@@ -9,6 +9,7 @@ extern "C" {
 {%endeach%}
 }
 
+
 #include "../include/functions/copy.h"
 #include "../include/macros.h"
 #include "../include/{{ filename }}.h"
@@ -17,6 +18,9 @@ extern "C" {
 #include "{{ dependency }}"
 {%endeach%}
 
+#include <iostream>
+
+using namespace std;
 using namespace v8;
 using namespace node;
 
diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -17,6 +17,7 @@ extern "C" {
 {%each dependencies as dependency%}
 #include "{{ dependency }}"
 {%endeach%}
+#include <iostream>
 
 using namespace v8;
 using namespace node;
@@ -40,7 +41,7 @@ using namespace std;
 {{ cppClassName }}::~{{ cppClassName }}() {
   // This is going to cause memory leaks. We'll have to solve that later
   // TODO: Clean up memory better
-  if (!this->selfFreeing) {
+  if (this->selfFreeing) {
     free(this->raw);
   }
 }
diff --git a/generate/utils.js b/generate/utils.js
@@ -270,7 +270,6 @@ var Utils = {
       arg.isSelf = Utils.isPointer(arg.type) && normalizedType == classDef.cType;
 
       if (arg.isReturn && fnDef.return && fnDef.return.type === "int") {
-        debugger;
         fnDef.return.isErrorCode = true;
         fnDef.isAsync = true;
       }
diff --git a/lib/clone.js b/lib/clone.js
@@ -22,8 +22,8 @@ Clone.clone = function(url, local_path, options) {
   options = normalizeOptions(options, NodeGit.CloneOptions);
 
   if (remoteCallbacks) {
-    options.remoteCallbacks = normalizeOptions(remoteCallbacks,
-      NodeGit.RemoteCallbacks);
+    options.remoteCallbacks =
+      normalizeOptions(remoteCallbacks, NodeGit.RemoteCallbacks);
   }
 
   return clone.call(this, url, local_path, options);
diff --git a/lib/tree_entry.js b/lib/tree_entry.js
@@ -1,6 +1,7 @@
 var path = require("path");
 var NodeGit = require("../");
 
+var Tree = NodeGit.Tree;
 var TreeEntry = NodeGit.TreeEntry;
 
 /**
@@ -96,4 +97,8 @@ TreeEntry.prototype.toString = function() {
   return this.path();
 };
 
+TreeEntry.prototype.oid = function() {
+  return Tree.entryId(this).toString();
+};
+
 module.exports = TreeEntry;
diff --git a/lib/util/normalize_oid.js b/lib/util/normalize_oid.js
@@ -11,7 +11,6 @@ function normalizeOid(oid) {
     return typeof oid === "string" ? NodeGit.Oid.fromString(oid) : oid;
   }
   catch (ex) {
-    console.log(ex);
     return null;
   }
 }
diff --git a/test/tests/tree_entry.js b/test/tests/tree_entry.js
@@ -76,4 +76,3 @@ describe("TreeEntry", function() {
     });
   });
 });
-

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,6 @@ var Utils = {`
`270`	`270`	`arg.isSelf = Utils.isPointer(arg.type) && normalizedType == classDef.cType;`
`271`	`271`
`272`	`272`	`if (arg.isReturn && fnDef.return && fnDef.return.type === "int") {`
`273`		`- debugger;`
`274`	`273`	`fnDef.return.isErrorCode = true;`
`275`	`274`	`fnDef.isAsync = true;`
`276`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ Clone.clone = function(url, local_path, options) {`
`22`	`22`	`options = normalizeOptions(options, NodeGit.CloneOptions);`
`23`	`23`
`24`	`24`	`if (remoteCallbacks) {`
`25`		`- options.remoteCallbacks = normalizeOptions(remoteCallbacks,`
`26`		`- NodeGit.RemoteCallbacks);`
	`25`	`+ options.remoteCallbacks =`
	`26`	`+ normalizeOptions(remoteCallbacks, NodeGit.RemoteCallbacks);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`return clone.call(this, url, local_path, options);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ function normalizeOid(oid) {`
`11`	`11`	`return typeof oid === "string" ? NodeGit.Oid.fromString(oid) : oid;`
`12`	`12`	`}`
`13`	`13`	`catch (ex) {`
`14`		`- console.log(ex);`
`15`	`14`	`return null;`
`16`	`15`	`}`
`17`	`16`	`}`
-Original file line number
+Diff line change
     });
   });
 });
+-