Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / globalizer.cpp

diff --git a/OSX/libsecurity_utilities/lib/globalizer.cpp b/OSX/libsecurity_utilities/lib/globalizer.cpp
index df5af3bc008e358b8c070f4f811061dd388d17e8..7d8306a10fcc4f923eb1e65bb66be3cece64031e 100644 (file)
--- a/OSX/libsecurity_utilities/lib/globalizer.cpp
+++ b/OSX/libsecurity_utilities/lib/globalizer.cpp
@@ -42,7 +42,7 @@
 //
 // The Error class thrown if Nexus operations fail
 //
 //
 // The Error class thrown if Nexus operations fail
 //

-GlobalNexus::Error::~Error() throw()
+GlobalNexus::Error::~Error() _NOEXCEPT

 {
 }
 
 {
 }
 


@@ -80,7 +80,7 @@ ProcessNexusBase::ProcessNexusBase(const char *identifier)
 {
        const char *env = getenv(identifier);
        if (env == NULL) {      // perhaps we're first...
 {
        const char *env = getenv(identifier);
        if (env == NULL) {      // perhaps we're first...

-               auto_ptr<Store> store(new Store);
+               unique_ptr<Store> store(new Store);

                char form[2*sizeof(Store *) + 2];
                sprintf(form, "*%p", &store);
                setenv(identifier, form, 0);    // do NOT overwrite...
                char form[2*sizeof(Store *) + 2];
                sprintf(form, "*%p", &store);
                setenv(identifier, form, 0);    // do NOT overwrite...