Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated copyright message
[modules/kernel.git]
/
src
/
HDFPersist
/
HDFconvert.cc
diff --git
a/src/HDFPersist/HDFconvert.cc
b/src/HDFPersist/HDFconvert.cc
index a96f12a36d59d24a2bde15b10b41d04f3545437e..fc0395c7dad55d1b2e1c9e7148fdd5e551e86aa8 100644
(file)
--- a/
src/HDFPersist/HDFconvert.cc
+++ b/
src/HDFPersist/HDFconvert.cc
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 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
@@
-68,9
+68,13
@@
int HDFConvert::FromAscii(const std::string& file, const HDFcontainerObject & hd
#elif defined WIN32
#define SHMEMSIZE 4096
#elif defined WIN32
#define SHMEMSIZE 4096
-
+#ifdef UNICODE
+ std::wstring empty = L"";
+#else
+ std::string empty = "";
+#endif
HANDLE hMapObject = CreateFileMapping(
HANDLE hMapObject = CreateFileMapping(
- INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, SHMEMSIZE,
""
);
+ INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, SHMEMSIZE,
empty.c_str()
);
if (hMapObject != NULL) {
// Get a pointer to the file-mapped shared memory.
buffer = ( char* ) MapViewOfFile(
if (hMapObject != NULL) {
// Get a pointer to the file-mapped shared memory.
buffer = ( char* ) MapViewOfFile(
@@
-82,7
+86,7
@@
int HDFConvert::FromAscii(const std::string& file, const HDFcontainerObject & hd
#else
// Sort de la compilation
#else
// Sort de la compilation
-#error
Necessite l''utilisation de la primitive mmap
+#error
"Necessite l'utilisation de la primitive mmap"
#endif
#endif
@@
-118,6
+122,5
@@
int HDFConvert::FromAscii(const std::string& file, const HDFcontainerObject & hd
return -1;
};
return -1;
};
-
- return length;
-};
+ return (int)length;
+}