Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
Driver
/
Driver_Mesh.cxx
diff --git
a/src/Driver/Driver_Mesh.cxx
b/src/Driver/Driver_Mesh.cxx
index 30000d5df0f25cdf25f00205cd2187b06a7f0ff3..b1f43062612e7304ef538e0b86d5e37a7becadf1 100644
(file)
--- a/
src/Driver/Driver_Mesh.cxx
+++ b/
src/Driver/Driver_Mesh.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, 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
@@
-28,7
+28,6
@@
#include "SMESH_Comment.hxx"
#include "SMESH_Comment.hxx"
-//#define _DEBUG_
#include <utilities.h>
using namespace std;
#include <utilities.h>
using namespace std;
@@
-79,9
+78,7
@@
Driver_Mesh::Status Driver_Mesh::addMessage(const std::string& msg,
myErrorMessages.push_back( msg );
MESSAGE(msg);
myErrorMessages.push_back( msg );
MESSAGE(msg);
-#ifdef _DEBUG_
- cout << msg << endl;
-#endif
+
return ( myStatus = isFatal ? DRS_FAIL : DRS_WARN_SKIP_ELEM );
}
return ( myStatus = isFatal ? DRS_FAIL : DRS_WARN_SKIP_ELEM );
}
@@
-123,15
+120,15
@@
std::string Driver_Mesh::fixUTF8(const std::string & str )
// how many bytes follow?
int len = 0;
// how many bytes follow?
int len = 0;
- if (s[i] >> 5 == 0b110 ) len = 1; //
todo: binary constants are a GCC extension
- else if (s[i] >> 4 == 0b1110 ) len = 2;
// todo: binary constants are a GCC extension
- else if (s[i] >> 3 == 0b11110) len = 3;
// todo: binary constants are a GCC extension
+ if (s[i] >> 5 == 0b110 ) len = 1; //
WARNING: binary constants included in C++14
+ else if (s[i] >> 4 == 0b1110 ) len = 2;
+ else if (s[i] >> 3 == 0b11110) len = 3;
else
invalid = true;
// check the bytes
for ( int j = 0; j < len && !invalid; ++j )
else
invalid = true;
// check the bytes
for ( int j = 0; j < len && !invalid; ++j )
- invalid = ( s[i+j+1] >> 6 != 0b10 );
// todo: binary constants are a GCC extension
+ invalid = ( s[i+j+1] >> 6 != 0b10 );
if ( invalid )
fixed[i] = '?';
if ( invalid )
fixed[i] = '?';