Skip to content

v0.2.55..v0.2.56 changeset ElementMergerJs.h

Garret Voltz edited this page Aug 14, 2020 · 3 revisions
diff --git a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ElementMergerJs.h b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ElementMergerJs.h
index acf606c..37c41d1 100644
--- a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ElementMergerJs.h
+++ b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ElementMergerJs.h
@@ -22,14 +22,14 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 #ifndef ELEMENTMERGERJS_H
 #define ELEMENTMERGERJS_H
 
 // Hoot
-#include <hoot/js/HootJsStable.h>
+#include <hoot/js/HootBaseJs.h>
 #include <hoot/js/SystemNodeJs.h>
 #include <hoot/js/PluginContext.h>
 #include <hoot/core/elements/OsmMap.h>
@@ -59,7 +59,7 @@ namespace hoot
  * scripts have their own merge functions already defined that users may want to customize, for
  * consistency's sake it makes more sense to use this hybrid approach.
  */
-class ElementMergerJs : public node::ObjectWrap
+class ElementMergerJs : public HootBaseJs
 {
 
 public:
@@ -75,12 +75,13 @@ public:
  static void Init(v8::Handle<v8::Object> target);
  static void mergeElements(const v8::FunctionCallbackInfo<v8::Value>& args);
 
+ virtual ~ElementMergerJs() = default;
+
 private:
 
  friend class ElementMergerJsTest;
 
-  ElementMergerJs();
-  ~ElementMergerJs();
+  ElementMergerJs() = default;
 
   static void _mergeElements(OsmMapPtr map, v8::Isolate* current);
 
Clone this wiki locally