Index: doc_shared_memory2.cpp
===================================================================
--- doc_shared_memory2.cpp	(revision 45395)
+++ doc_shared_memory2.cpp	(working copy)
@@ -33,9 +33,11 @@
          }
       }
       std::cout << "Test successful!" << std::endl;
+      shared_memory_object::remove("shared_memory");
    }
    catch(interprocess_exception &ex){
       std::cout << "Unexpected exception: " << ex.what() << std::endl;
+      shared_memory_object::remove("shared_memory");
       return 1;
    }
 
Index: doc_shared_memory.cpp
===================================================================
--- doc_shared_memory.cpp	(revision 45395)
+++ doc_shared_memory.cpp	(working copy)
@@ -38,7 +38,6 @@
       std::cout << ex.what() << std::endl;
       return 1;
    }
-   shared_memory_object::remove("shared_memory");
    return 0;
 }
 //]