[SCM] OCE packaging branch, debian, updated. debian/0.11-1

Denis Barbier bouzim at gmail.com
Thu Dec 13 19:16:49 UTC 2012


The following commit has been merged in the debian branch:
commit a8913b172927c547b7e005e15d289e0ca7914134
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Dec 1 18:25:06 2012 +0100

    Slightly amend 1c63761: use Standard_CString instead of Standard_Character* to drop casts

diff --git a/inc/OSD_EnvironmentIterator.hxx b/inc/OSD_EnvironmentIterator.hxx
index 18dc2fb..eecb134 100644
--- a/inc/OSD_EnvironmentIterator.hxx
+++ b/inc/OSD_EnvironmentIterator.hxx
@@ -80,7 +80,7 @@ private:
 
 Standard_Address myEnv;
 #ifdef WNT
-Standard_Character * myCount;
+Standard_CString myCount;
 #else
 Standard_Integer myCount;
 #endif
diff --git a/src/OSD/OSD_EnvironmentIterator.cxx b/src/OSD/OSD_EnvironmentIterator.cxx
index 08ed95f..97f7e4f 100644
--- a/src/OSD/OSD_EnvironmentIterator.cxx
+++ b/src/OSD/OSD_EnvironmentIterator.cxx
@@ -102,7 +102,7 @@ Standard_Integer OSD_EnvironmentIterator::Error()const{
 OSD_EnvironmentIterator :: OSD_EnvironmentIterator () {
 
  myEnv   = GetEnvironmentStrings ();
- myCount = reinterpret_cast<Standard_Character*>(myEnv);
+ myCount = reinterpret_cast<Standard_CString>(myEnv);
 
 }  // end constructor
 
@@ -114,7 +114,7 @@ void OSD_EnvironmentIterator :: Destroy () {
 
 Standard_Boolean OSD_EnvironmentIterator :: More () {
 
- return *(  ( Standard_CString )myCount  ) ? Standard_True : Standard_False;
+ return *myCount ? Standard_True : Standard_False;
 
 }  // end OSD_EnvironmentIterator :: More
 
@@ -122,7 +122,7 @@ void OSD_EnvironmentIterator :: Next () {
 
  if (  More ()  ) {
  
-  while (   *( Standard_CString )myCount  ) ++myCount;
+  while (   *myCount  ) ++myCount;
 
   ++myCount;
  
@@ -134,7 +134,7 @@ OSD_Environment OSD_EnvironmentIterator :: Values () {
 
  TCollection_AsciiString env, name, value;
 
- env = ( Standard_CString )myCount;
+ env = myCount;
 
  name  = env.Token (  TEXT( "=" ), 1  );
  value = env.Token (  TEXT( "=" ), 2  );

-- 
OCE packaging



More information about the debian-science-commits mailing list