[aaf-commits] AAF/ref-impl/src/OM OMSSStoredObject.cpp, 1.16, 1.17 OMSymbolspace.cpp, 1.2, 1.3

[Stuart C. <stu...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/src/OM
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7891/ref-impl/src/OM

Modified Files:
	OMSSStoredObject.cpp OMSymbolspace.cpp 
Log Message:
Fix gcc 4.3 warning suggesting parentheses around && within || to improve
readability (&& has higher precendence than ||).


Index: OMSymbolspace.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMSymbolspace.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OMSymbolspace.cpp	26 Mar 2007 16:00:55 -0000	1.2
--- OMSymbolspace.cpp	26 Feb 2008 05:43:21 -0000	1.3
***************
*** 943,948 ****
              for (j = 0; j < count; j++)
              {
!                 if (typeForReg->dependsOnAType() && !dictionary->registerTypeDef(dependencies->getAt(j)) ||
!                     !typeForReg->dependsOnAType() && !dictionary->registerClassDef(dependencies->getAt(j)))
                  {
                      dependenciesSatified = false;
--- 943,948 ----
              for (j = 0; j < count; j++)
              {
!                 if ((typeForReg->dependsOnAType() && !dictionary->registerTypeDef(dependencies->getAt(j))) ||
!                     (!typeForReg->dependsOnAType() && !dictionary->registerClassDef(dependencies->getAt(j))))
                  {
                      dependenciesSatified = false;
***************
*** 954,959 ****
          {
              dependenciesSatified = true;
!             if (typeForReg->dependsOnAType() && !dictionary->registerTypeDef(*typeForReg->dependsOn()) ||
!                 !typeForReg->dependsOnAType() && !dictionary->registerClassDef(*typeForReg->dependsOn()))
              {
                  dependenciesSatified = false;
--- 954,959 ----
          {
              dependenciesSatified = true;
!             if ((typeForReg->dependsOnAType() && !dictionary->registerTypeDef(*typeForReg->dependsOn())) ||
!                 (!typeForReg->dependsOnAType() && !dictionary->registerClassDef(*typeForReg->dependsOn())))
              {
                  dependenciesSatified = false;

Index: OMSSStoredObject.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMSSStoredObject.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** OMSSStoredObject.cpp	27 Jul 2007 21:19:04 -0000	1.16
--- OMSSStoredObject.cpp	26 Feb 2008 05:43:21 -0000	1.17
***************
*** 147,152 ****
    checkStatus(status);
    PRECONDITION ("Valid root storage access mode: ", 
!   		((mode == OMFile::modifyMode && (statstg.grfMode & (STGM_READWRITE)) ||
! 		(mode == OMFile::readOnlyMode && (statstg.grfMode & STGM_READ) == 0))));
  
    OMSSStoredObject* newStore = new OMSSStoredObject(in_storage);
--- 147,152 ----
    checkStatus(status);
    PRECONDITION ("Valid root storage access mode: ", 
!   		((mode == OMFile::modifyMode && (statstg.grfMode & (STGM_READWRITE))) ||
! 		(mode == OMFile::readOnlyMode && (statstg.grfMode & STGM_READ) == 0)));
  
    OMSSStoredObject* newStore = new OMSSStoredObject(in_storage);