Fixes for merging errors.

diff --git a/src/FSD/FSD_CmpFile.cxx b/src/FSD/FSD_CmpFile.cxx
index fd6b026c03eb4f51264bc7ee30e93755cda0a1ab..d102791883c965c18e1decb2c864371d32e0487a 100644 (file)
--- a/src/FSD/FSD_CmpFile.cxx
+++ b/src/FSD/FSD_CmpFile.cxx
@@ -623,11 +623,6 @@ Storage_BaseDriver& FSD_CmpFile::GetReal(Standard_Real& aValue)
     Storage_StreamTypeMismatchError::Raise();
 
   return *this;
-#else
-  if (!(myStream >> aValue)) Storage_StreamTypeMismatchError::Raise();
-
-  return *this;
-#endif
 }
 
 //=======================================================================
@@ -645,10 +640,6 @@ Storage_BaseDriver& FSD_CmpFile::GetShortReal(Standard_ShortReal& aValue)
     Storage_StreamTypeMismatchError::Raise();
 
   return *this;
-#else
-  if (!(myStream >> aValue)) Storage_StreamTypeMismatchError::Raise();
- return *this;
-#endif
 }
 
 //=======================================================================

diff --git a/src/FWOSDriver/FWOSDriver.cdl b/src/FWOSDriver/FWOSDriver.cdl
index 4b1d0679a84c0ac501e93b16ccf5a06f735edf13..bbfb3ac123769eaecc3a32a2f2f8ffb46a263745 100644 (file)
--- a/src/FWOSDriver/FWOSDriver.cdl
+++ b/src/FWOSDriver/FWOSDriver.cdl
@@ -17,7 +17,7 @@
 package FWOSDriver
 
 uses
-    CDM,CDF,TCollection
+    CDM,CDF,TCollection,Storage
 
 is
     class Driver;

diff --git a/src/FWOSDriver/FWOSDriver_Driver.cxx b/src/FWOSDriver/FWOSDriver_Driver.cxx
index 7d21d776788f8027b67cc730b5a81438dba8adda..c08e2302219b98bb5ee9eedb386ddad0cc26ebe7 100644 (file)
--- a/src/FWOSDriver/FWOSDriver_Driver.cxx
+++ b/src/FWOSDriver/FWOSDriver_Driver.cxx
@@ -96,7 +96,7 @@ Standard_Boolean FWOSDriver_Driver::HasReadPermission(const TCollection_Extended
 //function : MetaData
 //purpose  :
 //==============================================================================
-Handle(CDM_MetaData) FWOSDriver_FWOSDriver::MetaData(const Handle(Storage_IODevice)& aDevice,
+Handle(CDM_MetaData) FWOSDriver_Driver::MetaData(const Handle(Storage_IODevice)& aDevice,
                                                      const TCollection_ExtendedString& /*aVersion*/)
 {
   //  TCollection_ExtendedString p = Concatenate(aFolder,aName);
@@ -107,7 +107,7 @@ Handle(CDM_MetaData) FWOSDriver_FWOSDriver::MetaData(const Handle(Storage_IODevi
 //function : CreateMetaData
 //purpose  :
 //==============================================================================
-Handle(CDM_MetaData) FWOSDriver_FWOSDriver::CreateMetaData(const Handle(CDM_Document)& aDocument)
+Handle(CDM_MetaData) FWOSDriver_Driver::CreateMetaData(const Handle(CDM_Document)& aDocument)
 {
   return CDM_MetaData::LookUp(aDocument->RequestedDevice(),!aDocument->RequestedDevice()->CanWrite());
 }
@@ -116,7 +116,7 @@ Handle(CDM_MetaData) FWOSDriver_FWOSDriver::CreateMetaData(const Handle(CDM_Docu
 //function : BuildFileName
 //purpose  :
 //==============================================================================
-TCollection_ExtendedString FWOSDriver_FWOSDriver::BuildFileName(const Handle(CDM_Document)& aDocument)
+TCollection_ExtendedString FWOSDriver_Driver::BuildFileName(const Handle(CDM_Document)& aDocument)
 {
 /*
   TCollection_ExtendedString retstr = TCollection_ExtendedString(aDocument->RequestedFolder());
@@ -189,7 +189,7 @@ TCollection_ExtendedString FWOSDriver_Driver::DefaultFolder()
 //function : BuildMetaData
 //purpose  :
 //==============================================================================
-Handle(CDM_MetaData) FWOSDriver_FWOSDriver::BuildMetaData(const Handle(Storage_IODevice)& aDevice)
+Handle(CDM_MetaData) FWOSDriver_Driver::BuildMetaData(const Handle(Storage_IODevice)& aDevice)
 {
 /*
   OSD_Path p = UTL::Path(aFileName);
@@ -208,7 +208,7 @@ Handle(CDM_MetaData) FWOSDriver_FWOSDriver::BuildMetaData(const Handle(Storage_I
 //function : SetName
 //purpose  :
 //==============================================================================
-TCollection_ExtendedString FWOSDriver_FWOSDriver::SetName(const Handle(CDM_Document)& aDocument,
+TCollection_ExtendedString FWOSDriver_Driver::SetName(const Handle(CDM_Document)& aDocument,
                                                       const TCollection_ExtendedString& aName)
 {
   

diff --git a/src/UTL/UTL.cxx b/src/UTL/UTL.cxx
index 8755d205d9245ab87579a1f4ed40b2698ef2ede5..4d1ceae6c4a26658addd78c82cca445b3abe3089 100644 (file)
--- a/src/UTL/UTL.cxx
+++ b/src/UTL/UTL.cxx
@@ -54,7 +54,6 @@ TCollection_ExtendedString UTL::Extension(const TCollection_ExtendedString& aFil
   OSD_Path p = OSD_Path(ASCII(aFileName));
 
   TCollection_AsciiString theExtension=p.Extension();
-/*
   TCollection_AsciiString theGoodExtension=theExtension;;
 
   if(TCollection_AsciiString(theExtension.Value(1))==".") 
@@ -62,7 +61,6 @@ TCollection_ExtendedString UTL::Extension(const TCollection_ExtendedString& aFil
 
   return UNICODE(theGoodExtension);
 }
-*/
 void UTL::AddToUserInfo(const Handle(Storage_Data)& aData, const TCollection_ExtendedString& anInfo) {
   aData->AddToUserInfo(ASCII(anInfo));
 }