[certi-cvs] certi libCERTI/SocketSHMWin32.cc libHLA/Semapho...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/28 12:36:32

Modified files:
        libCERTI       : SocketSHMWin32.cc 
        libHLA         : SemaphoreWin32.cc 

Log message:
        Update Win32 compile
        Exception defined fro Win32 classes was still in certi:: moved to 
libhla::ipc::XXXX instead.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketSHMWin32.cc?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/SemaphoreWin32.cc?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: libCERTI/SocketSHMWin32.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketSHMWin32.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libCERTI/SocketSHMWin32.cc  20 Jan 2010 15:06:54 -0000      1.2
+++ libCERTI/SocketSHMWin32.cc  28 Mar 2010 12:36:32 -0000      1.3
@@ -19,6 +19,14 @@
 // ----------------------------------------------------------------------------
 
 #include "SocketSHMWin32.hh"
+#include "SHMWin32.hh"
+using libhla::ipc::SHM;
+using libhla::ipc::SHMWin32;
+
+#include "SemaphoreWin32.hh"
+using libhla::ipc::Semaphore;
+using libhla::ipc::SemaphoreWin32;
+
 
 // ************************************************
 // Constructor with args

Index: libHLA/SemaphoreWin32.cc
===================================================================
RCS file: /sources/certi/certi/libHLA/SemaphoreWin32.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libHLA/SemaphoreWin32.cc    28 Mar 2010 11:42:35 -0000      1.1
+++ libHLA/SemaphoreWin32.cc    28 Mar 2010 12:36:32 -0000      1.2
@@ -18,7 +18,7 @@
 // Method : SemaphoreWin32::Create_Init(...)
 // ************************************************
 void SemaphoreWin32::Create_Init(const int initval, const std::string& 
New_Semname)
-                                 throw(certi::SemaphoreNotCreated) {
+                                 throw(SemaphoreNotCreated) {
 
 _hSemaphore = CreateSemaphore(
                       (LPSECURITY_ATTRIBUTES)NULL,             // security 
attributes
@@ -27,7 +27,7 @@
                       (LPCTSTR)(New_Semname.c_str()));         // named 
semaphore
 
  if (_hSemaphore == NULL){
-      throw(certi::SemaphoreNotCreated("CreateSemaphore() failed.")) ;
+      throw(SemaphoreNotCreated("CreateSemaphore() failed.")) ;
  }
  #ifdef DEBUG
  std::cout << "We create the semaphore identified by handle : " << _hSemaphore 
<< " and name : " << New_Semname << std::endl ;
@@ -39,7 +39,7 @@
 // Method : SemaphoreWin32::Attach(...)
 // ************************************************
 void SemaphoreWin32::Attach(const std::string& New_Semname)
-                            throw(certi::SemaphoreNotOpen){
+                            throw(SemaphoreNotOpen){
 
 // Open the semaphore
 
@@ -54,7 +54,7 @@
 
    if (_hSemaphore == NULL)
    {
-        throw(certi::SemaphoreNotOpen("OpenSemaphore() failed.")) ;
+        throw(SemaphoreNotOpen("OpenSemaphore() failed.")) ;
    }
 
 } // End of method : Attach(...)
@@ -64,7 +64,7 @@
 // ************************************************
 
 void SemaphoreWin32::P()
-                    throw(certi::SemaphoreHandlingError) {
+                    throw(SemaphoreHandlingError) {
 
 #ifdef DEBUG
 std::cout << "Begin of Operation P for the semaphore identified by handle : " 
<< _hSemaphore << std::endl ;
@@ -86,7 +86,7 @@
 
           default:
              // Handle errors
-             throw(certi::SemaphoreHandlingError("WaitForSingleObject() 
failed.")) ;
+             throw(SemaphoreHandlingError("WaitForSingleObject() failed.")) ;
       }
 
 #ifdef DEBUG
@@ -101,7 +101,7 @@
 // ************************************************
 
 void SemaphoreWin32::V()
-                    throw(certi::SemaphoreHandlingError) {
+                    throw(SemaphoreHandlingError) {
 
 #ifdef DEBUG
 std::cout << "Begin of Operation V for the semaphore identified by handle : " 
<< _hSemaphore << std::endl ;
@@ -115,7 +115,7 @@
         NULL) ;       // not interested in previous count
 
   if (retcode == 0) {
-      throw(certi::SemaphoreHandlingError("ReleaseSemaphore() failed.")) ;
+      throw(SemaphoreHandlingError("ReleaseSemaphore() failed.")) ;
     }
 
 #ifdef DEBUG
@@ -128,7 +128,7 @@
 // Method : SemaphoreWin32::Delete
 // ************************************************
 void SemaphoreWin32::Delete()
-                    throw(certi::HandleNotClosed) {
+                    throw(HandleNotClosed) {
 
 BOOL WINAPI retcode ;
 
@@ -139,7 +139,7 @@
 retcode = CloseHandle(_hSemaphore);
 
 if(retcode == 0)
-   throw(certi::HandleNotClosed("CloseHandle() failed.")) ;
+   throw(HandleNotClosed("CloseHandle() failed.")) ;
 } // End of Delete()
 
 } /* end namespace ipc  */