← Back to branch summary

~ubuntu-branches/debian/jessie/scummvm/jessie

« back to all changes in this revision

Viewing changes to backends/plugins/elf/elf-provider.cpp

  • Committer: Package Import Robot
  • Author(s): Moritz Muehlenhoff
  • Date: 2011-11-05 10:29:43 UTC
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: package-import@ubuntu.com-20111105102943-zfm3dhlvy5b01u7v
Tags: upstream-1.4.0
Import upstream version 1.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
backends/plugins/elf/elf-provider.cpp
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
20
 *
21
 
 * $URL$
22
 
 * $Id$
23
 
 *
24
21
 */
25
22
 
26
23
#include "common/scummsys.h"
103
100
void ELFPlugin::trackSize() {
104
101
        // All we need to do is create our object, track its size, then delete it
105
102
        DLObject *obj = makeDLObject();
106
 
        
 
103
 
107
104
        obj->trackSize(_filename.c_str());
108
105
        delete obj;
109
106
}
183
180
PluginList ELFPluginProvider::getPlugins() {
184
181
        PluginList pl = FilePluginProvider::getPlugins();
185
182
 
186
 
#if defined(UNCACHED_PLUGINS) && !defined(ELF_NO_MEM_MANAGER)   
 
183
#if defined(UNCACHED_PLUGINS) && !defined(ELF_NO_MEM_MANAGER)
187
184
        // This static downcast is safe because all of the plugins must
188
185
        // be ELF plugins
189
186
        for (PluginList::iterator p = pl.begin(); p != pl.end(); ++p) {
193
190
        // The Memory Manager should now allocate space based on the information
194
191
        // it collected
195
192
        ELFMemMan.allocateHeap();
196
 
#endif  
197
 
        
 
193
#endif
 
194
 
198
195
        return pl;
199
196
}
200
197
 
210
207
}
211
208
 
212
209
#endif // defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER)
213