Merge pull request #10 from fzeder/master

One memory leak less.
This commit is contained in:
Matthias Jung
2015-06-02 22:03:39 +02:00
4 changed files with 14 additions and 4 deletions

View File

@@ -38,6 +38,16 @@ your changes to the official codebase.
$ git clone --recursive https://<user>@git.rhrk.uni-kl.de/<user>/dram.vp.system.git
```
After a pull request being accepted and merged into the official repository
you should get your fork updated.
``` bash
$ git fetch upstream
$ git checkout master
$ git merge upstream/master
$ git push origin HEAD
```
After cloning go to the project directory.
``` bash

View File

@@ -75,6 +75,8 @@ gp* MemoryManager::allocate()
void MemoryManager::free(gp* payload)
{
unsigned char *dptr = payload->get_data_ptr();
delete[] dptr;
payload->reset(); //clears all extensions
freePayloads.push_back(payload);
}

View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) 2015, University of Kaiserslautern
* All rights reserved.
*

View File

@@ -36,13 +36,11 @@
#include <iostream>
#include <string>
#include "SimulationManager.h"
#include "../controller/core/configuration/Configuration.h"
#include <systemc.h>
#include <utility>
#include <vector>
#include "SimulationManager.h"
using namespace std;