Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INT PAL 0052660: Plot2D Viewer: Plot2d_Curve can't be selected
[modules/gui.git]
/
src
/
DDS
/
DDS_Dictionary.cxx
diff --git
a/src/DDS/DDS_Dictionary.cxx
b/src/DDS/DDS_Dictionary.cxx
index 6c99b77251439a5ca9c3548696c3ecf5e01da66d..8ff6ffa92989828c630662e252853e605fe000d6 100644
(file)
--- a/
src/DDS/DDS_Dictionary.cxx
+++ b/
src/DDS/DDS_Dictionary.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-24,8
+24,6
@@
#include "DDS_KeyWords.h"
#include "DDS_KeyWords.h"
-#include <Basics_OCCTVersion.hxx>
-
#include <LDOMString.hxx>
#include <LDOMParser.hxx>
#include <LDOMString.hxx>
#include <LDOMParser.hxx>
@@
-555,9
+553,7
@@
Standard_Real DDS_Dictionary::ToSI( const Standard_Real theValue, const Standard
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
aRetValue = UnitsAPI::AnyToSI( theValue, theUnits );
}
catch( Standard_Failure ) {
aRetValue = UnitsAPI::AnyToSI( theValue, theUnits );
}
catch( Standard_Failure ) {
@@
-582,9
+578,7
@@
Standard_Real DDS_Dictionary::FromSI( const Standard_Real theValue, const Standa
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
if ( theUnits && *theUnits && strcmp( theUnits, "%" ) )
{
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
aRetValue = UnitsAPI::AnyFromSI( theValue, theUnits );
}
catch( Standard_Failure ) {
aRetValue = UnitsAPI::AnyFromSI( theValue, theUnits );
}
catch( Standard_Failure ) {