Get rid of wrong SGReferencedData based assignment when using CMap

shogun-toolbox · Jul 14, 2012 · 3523a55 · 3523a55
1 parent 5068d3e
commit 3523a55
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/shogun/lib/Map.h b/src/shogun/lib/Map.h
@@ -363,6 +363,9 @@ IGNORE_IN_CLASSLIST template<class K, class T> class CMap: public CSGObject
 			else
 				new_node=(CMapNode<K, T>*) calloc(1, sizeof(CMapNode<K, T>));
 
+			new (&new_node->key) K();
+			new (&new_node->data) T();
+
 			array->append_element(new_node);
 
 			new_index=free_index;

diff --git a/src/shogun/lib/memory.cpp b/src/shogun/lib/memory.cpp
@@ -19,6 +19,11 @@ using namespace shogun;
 #ifdef TRACE_MEMORY_ALLOCS
 extern CMap<void*, shogun::MemoryBlock>* sg_mallocs;
 
+MemoryBlock::MemoryBlock() : ptr(NULL), size(0), file(NULL),
+	line(-1), is_sgobject(false)
+{
+}
+
 MemoryBlock::MemoryBlock(void* p) : ptr(p), size(0), file(NULL),
 	line(-1), is_sgobject(false)
 {

diff --git a/src/shogun/lib/memory.h b/src/shogun/lib/memory.h
@@ -60,6 +60,9 @@ namespace shogun
 class MemoryBlock
 {
 	public:
+		/** default constructor
+		 */
+		MemoryBlock();
 		/** constructor
 		 * @param p p
 		 */