Changes for Boost.1.39

[SVN r51964]

example/doc_unordered_map.cpp

@@ -20,46 +20,43 @@
 int main ()
 {
    using namespace boost::interprocess;
-   //Erase previous shared memory with the name
-   shared_memory_object::remove("MySharedMemory");
+   //Remove shared memory on construction and destruction
+   struct shm_destroy
+   {
+      shm_destroy() { shared_memory_object::remove("MySharedMemory"); }
+      ~shm_destroy(){ shared_memory_object::remove("MySharedMemory"); }
+   } remover;
 
-   try{
-      //Create shared memory
-      managed_shared_memory segment(create_only ,"MySharedMemory" ,65536);
+   //Create shared memory
+   managed_shared_memory segment(create_only ,"MySharedMemory" ,65536);
 
-      //Note that unordered_map<Key, MappedType>'s value_type is std::pair<const Key, MappedType>,
-      //so the allocator must allocate that pair.
-      typedef int    KeyType;
-      typedef float  MappedType;
-      typedef std::pair<const int, float> ValueType;
+   //Note that unordered_map<Key, MappedType>'s value_type is std::pair<const Key, MappedType>,
+   //so the allocator must allocate that pair.
+   typedef int    KeyType;
+   typedef float  MappedType;
+   typedef std::pair<const int, float> ValueType;
 
-      //Typedef the allocator
-      typedef allocator<ValueType, managed_shared_memory::segment_manager> ShmemAllocator;
+   //Typedef the allocator
+   typedef allocator<ValueType, managed_shared_memory::segment_manager> ShmemAllocator;
 
-      //Alias an unordered_map of ints that uses the previous STL-like allocator.
-      typedef boost::unordered_map
-         < KeyType               , MappedType
-         , boost::hash<KeyType>  ,std::equal_to<KeyType>
-         , ShmemAllocator>
-      MyHashMap;
+   //Alias an unordered_map of ints that uses the previous STL-like allocator.
+   typedef boost::unordered_map
+      < KeyType               , MappedType
+      , boost::hash<KeyType>  ,std::equal_to<KeyType>
+      , ShmemAllocator>
+   MyHashMap;
 
-      //Construct a shared memory hash map.
-      //Note that the first parameter is the initial bucket count and
-      //after that, the hash function, the equality function and the allocator
-      MyHashMap *myhashmap = segment.construct<MyHashMap>("MyHashMap")  //object name
-         ( 3, boost::hash<int>(), std::equal_to<int>()                  //
-         , segment.get_allocator<ValueType>());                         //allocator instance
+   //Construct a shared memory hash map.
+   //Note that the first parameter is the initial bucket count and
+   //after that, the hash function, the equality function and the allocator
+   MyHashMap *myhashmap = segment.construct<MyHashMap>("MyHashMap")  //object name
+      ( 3, boost::hash<int>(), std::equal_to<int>()                  //
+      , segment.get_allocator<ValueType>());                         //allocator instance
 
-      //Insert data in the hash map
-      for(int i = 0; i < 100; ++i){
-         myhashmap->insert(ValueType(i, (float)i));
-      }
+   //Insert data in the hash map
+   for(int i = 0; i < 100; ++i){
+      myhashmap->insert(ValueType(i, (float)i));
    }
-   catch(...){
-      shared_memory_object::remove("MySharedMemory");
-      throw;
-   }
-   shared_memory_object::remove("MySharedMemory");
    return 0;
 }
 //]