Merge pull request #137 from jwillemsen/jwi-uniqueptr2

Make use of std::unique_ptr instead of ACE_Auto_Ptr which is not avai…
RemedyIT · Nov 1, 2023 · cfc5b3f · cfc5b3f
2 parents 30e7f70 + 0f7d085
commit cfc5b3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/libr2tao/orb.cpp b/ext/libr2tao/orb.cpp
@@ -85,14 +85,14 @@ class R2CSigGuard : public ACE_Event_Handler
 
   static VALUE c_signums;
   static int c_nsig;
-  static ACE_Auto_Ptr<ACE_SIGACTION> c_sa;
+  static std::unique_ptr<ACE_SIGACTION> c_sa;
 
   static void init_ ();
 
   CORBA::ORB_var  m_orb;
   bool m_signal_reactor;
   ACE_Sig_Handler m_sig_handler;
-  ACE_Auto_Ptr<Signal> m_signal;
+  std::unique_ptr<Signal> m_signal;
   bool m_signal_caught;
 #if defined (WIN32)
   R2CSigGuard*    m_prev_guard;
@@ -867,7 +867,7 @@ VALUE rCORBA_ORB_lookup_value_factory(VALUE /*self*/, VALUE id)
 
 VALUE R2CSigGuard::c_signums = Qnil;
 int R2CSigGuard::c_nsig = 0;
-ACE_Auto_Ptr<ACE_SIGACTION> R2CSigGuard::c_sa;
+std::unique_ptr<ACE_SIGACTION> R2CSigGuard::c_sa;
 
 void R2CSigGuard::init_ ()
 {

diff --git a/lib/corba/common/version.rb b/lib/corba/common/version.rb
@@ -13,7 +13,7 @@
 module R2CORBA
   R2CORBA_MAJOR = 1
   R2CORBA_MINOR = 7
-  R2CORBA_RELEASE = 0
+  R2CORBA_RELEASE = 1
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 end