Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_cssm / lib / cssmcontext.h

diff --git a/OSX/libsecurity_cssm/lib/cssmcontext.h b/OSX/libsecurity_cssm/lib/cssmcontext.h
index 6f82501963c1ae9a37befe045767a1d4ce4f9ed4..4a5ae461c90c76c0e328a5f1fdfd9628518d771a 100644 (file)
--- a/OSX/libsecurity_cssm/lib/cssmcontext.h
+++ b/OSX/libsecurity_cssm/lib/cssmcontext.h
@@ -68,18 +68,18 @@ public:
     void mergeAttributes(const CSSM_CONTEXT_ATTRIBUTE *attributes, uint32 count);
     CSSM_RETURN validateChange(CSSM_CONTEXT_EVENT event);
 
     void mergeAttributes(const CSSM_CONTEXT_ATTRIBUTE *attributes, uint32 count);
     CSSM_RETURN validateChange(CSSM_CONTEXT_EVENT event);
 

-    void *operator new (size_t size, Allocator &alloc) throw(std::bad_alloc)
+    void *operator new (size_t size, Allocator &alloc)

     { return alloc.malloc(size); }
     { return alloc.malloc(size); }

-    void operator delete (void *addr, size_t, Allocator &alloc) throw()
+    void operator delete (void *addr, size_t, Allocator &alloc) _NOEXCEPT

     { return alloc.free(addr); }
     { return alloc.free(addr); }

-    static void destroy(HandleContext *context, Allocator &alloc) throw()
+    static void destroy(HandleContext *context, Allocator &alloc) _NOEXCEPT

     { context->~HandleContext(); alloc.free(context); }
 
     class Maker;       // deluxe builder
 
 #if __GNUC__ > 2
 private:
     { context->~HandleContext(); alloc.free(context); }
 
     class Maker;       // deluxe builder
 
 #if __GNUC__ > 2
 private:

-    void operator delete (void *addr) throw() { assert(0); }
+    void operator delete (void *addr) _NOEXCEPT { assert(0); }

 #endif
 
 protected:
 #endif
 
 protected: