livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More correction in llplugin ...

Nicky 2014-06-10 11:23:07 +02:00
parent 9c7ab535d4
commit cef556c152
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llplugin/llpluginprocesschild.cpp
View File

@ -366,8 +366,8 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
// This is a new region
// <FS:ND> use smartptr
LLPluginSharedMemory *region = new LLPluginSharedMemory;
//LLPluginSharedMemory region( new LLPluginSharedMemory );
// LLPluginSharedMemory *region = new LLPluginSharedMemory;
LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
// </FS:ND>
if(region->attach(name, size))

2
indra/llplugin/llpluginprocesschild.h
View File

@ -99,7 +99,7 @@ private:
// <FS:ND> Use boost::shred_ptr so LLPluginSharedMemory gets properly destroyed
// typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
typedef std::map<std::string, LLPluginSharedMemory > sharedMemoryRegionsType;
typedef std::map<std::string, LLPluginSharedMemoryPtr > sharedMemoryRegionsType;
// </FS:ND>
sharedMemoryRegionsType mSharedMemoryRegions;

4
indra/llplugin/llpluginprocessparent.cpp
View File

@ -1003,8 +1003,8 @@ std::string LLPluginProcessParent::addSharedMemory(size_t size)
std::string name;
// <FS:ND> Use smartptr
LLPluginSharedMemory *region = new LLPluginSharedMemory;
//LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
// LLPluginSharedMemory *region = new LLPluginSharedMemory;
LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
// </FS:ND>
// This is a new region

2
indra/llplugin/llpluginsharedmemory.h
View File

@ -28,6 +28,8 @@
#ifndef LL_LLPLUGINSHAREDMEMORY_H
#define LL_LLPLUGINSHAREDMEMORY_H
#include <boost/shared_ptr.hpp>
class LLPluginSharedMemoryPlatformImpl;
/**