0021196: [CEA 456] Integration and merge modification for debian packages

Remove unnecessary extern "C" instances and add one necessary one.
Background: One must not #include mpi.h from within an extern "C" block.
Both mpi.h and hdf5.h are C++-safe, and should be included directly without
extern "C".  For details, see:
http://www.open-mpi.org/community/lists/users/2007/12/4763.php

diff --git a/src/HDFPersist/HDFOI.hxx b/src/HDFPersist/HDFOI.hxx
index 23434e63fb780e74bf8501cd13af2b52d104090e..134aca9d8ea3778671cbcd6396d30e22288f93d0 100644 (file)
--- a/src/HDFPersist/HDFOI.hxx
+++ b/src/HDFPersist/HDFOI.hxx
@@ -24,10 +24,7 @@
 //  File   : HDFOI.hxx
 //  Module : SALOME
 //
-extern "C"
-{
 #include "HDFtypes.h"
-}
 
 #include "HDFattribute.hxx"
 #include "HDFfile.hxx"

diff --git a/src/HDFPersist/HDFattribute.cc b/src/HDFPersist/HDFattribute.cc
index 5ed08fc32a5e2a6c0a361415c1b051c7bc2c8f6e..6124a16306900fb50fdb18af75ac74fd883f46fc 100644 (file)
--- a/src/HDFPersist/HDFattribute.cc
+++ b/src/HDFPersist/HDFattribute.cc
@@ -24,10 +24,7 @@
 //  File   : HDFattribute.cc
 //  Module : SALOME
 //
-extern "C"
-{
 #include "hdfi.h"
-}
 #include "HDFexception.hxx"
 #include "HDFattribute.hxx"
 #include "HDFinternalObject.hxx"

diff --git a/src/HDFPersist/HDFattribute.hxx b/src/HDFPersist/HDFattribute.hxx
index a6acbf1f8d02f7fb08ebd7bd0b746671241d7360..6d8bdae787371ebbfa9c027788631d0bc4184957 100644 (file)
--- a/src/HDFPersist/HDFattribute.hxx
+++ b/src/HDFPersist/HDFattribute.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFATTRIBUTE_HXX
 #define HDFATTRIBUTE_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFinternalObject.hxx"
 #include "HDFcontainerObject.hxx"
 

diff --git a/src/HDFPersist/HDFcontainerObject.cc b/src/HDFPersist/HDFcontainerObject.cc
index 4936285f7f3f72f0672d991c156e5acf89325e09..b92d2df748a17294283eacc12447a2eed16a3c9c 100644 (file)
--- a/src/HDFPersist/HDFcontainerObject.cc
+++ b/src/HDFPersist/HDFcontainerObject.cc
@@ -24,10 +24,7 @@
 //  File   : HDFcontainerObject.cc
 //  Module : SALOME
 //
-extern "C"
-{
 #include "hdfi.h"
-}
 #include "HDFcontainerObject.hxx"
 #include "HDFexception.hxx"
 

diff --git a/src/HDFPersist/HDFcontainerObject.hxx b/src/HDFPersist/HDFcontainerObject.hxx
index 26bc6fdde94840d63f8c371e30ca71a7beb743d4..af2bbb43cafff696b37db2fcec062c1760818320 100644 (file)
--- a/src/HDFPersist/HDFcontainerObject.hxx
+++ b/src/HDFPersist/HDFcontainerObject.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFCONTAINEROBJECT_HXX
 #define HDFCONTAINEROBJECT_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFobject.hxx"
 #include "HDFinternalObject.hxx"
 #include "HDFexport.hxx"

diff --git a/src/HDFPersist/HDFconvert.hxx b/src/HDFPersist/HDFconvert.hxx
index a7595bad7f23eb3b45b4c9d6aa2d978f1852bee2..d280f7ab95d5a1c25a6c1af5b14adb8fe9f31b24 100644 (file)
--- a/src/HDFPersist/HDFconvert.hxx
+++ b/src/HDFPersist/HDFconvert.hxx
@@ -27,8 +27,6 @@
 #ifndef HDFCONVERT_HXX
 #define HDFCONVERT_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
 #ifndef WIN32
 #include <unistd.h>
@@ -40,7 +38,6 @@ extern "C"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-}
 #include "HDFexport.hxx"
 #include "HDFcontainerObject.hxx"
 #include "HDFdataset.hxx"

diff --git a/src/HDFPersist/HDFdataset.cc b/src/HDFPersist/HDFdataset.cc
index a0af78076af3dee8d38f2e027a9b31dcb595572e..e3ff8fe4565c7e5cc4463cc89300b9e27ed79a14 100644 (file)
--- a/src/HDFPersist/HDFdataset.cc
+++ b/src/HDFPersist/HDFdataset.cc
@@ -24,11 +24,8 @@
 //  File   : HDFdataset.cc
 //  Module : SALOME
 //
-extern "C"
-{
 #include "hdfi.h"
 #include <string.h>
-}
 #include "HDFdataset.hxx"
 #include "HDFcontainerObject.hxx"
 #include "HDFexception.hxx"

diff --git a/src/HDFPersist/HDFdataset.hxx b/src/HDFPersist/HDFdataset.hxx
index 96d69ebdfaed3db5b801a047de5f51e42be802fe..d85778dd596aa13e622c1dbc0761de0cc88ec598 100644 (file)
--- a/src/HDFPersist/HDFdataset.hxx
+++ b/src/HDFPersist/HDFdataset.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFDATASET_HXX
 #define HDFDATASET_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFinternalObject.hxx"
 #include "HDFcontainerObject.hxx"
 #include "HDFexport.hxx"

diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc
index a56b0164a520db93f611aed5fb63a32497ef8029..fe7af1d5df178d252d739b2513ec4d0b45a1f070 100644 (file)
--- a/src/HDFPersist/HDFfile.cc
+++ b/src/HDFPersist/HDFfile.cc
@@ -24,8 +24,6 @@
 //  File   : HDFfile.cc
 //  Module : SALOME
 //
-extern "C"
-{
 #include "hdfi.h"
 #ifndef WIN32
 #include <unistd.h>
@@ -35,7 +33,6 @@ extern "C"
 #define access _access
 #endif
 #include <string.h>
-}
 #include <iostream>
 #include "HDFfile.hxx"
 #include "HDFexception.hxx"

diff --git a/src/HDFPersist/HDFfile.hxx b/src/HDFPersist/HDFfile.hxx
index fd3cd04295f1f35517f525fcb1ee1d3077249ea6..de3e694e1683852a8184788b6b11e1c97b28521d 100644 (file)
--- a/src/HDFPersist/HDFfile.hxx
+++ b/src/HDFPersist/HDFfile.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFFILE_HXX
 #define HDFFILE_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFcontainerObject.hxx"
 #include "HDFexport.hxx"
 

diff --git a/src/HDFPersist/HDFgroup.cc b/src/HDFPersist/HDFgroup.cc
index f8ffa2df3ee1545cc1b944c7cdc668e3bd299cec..ce3de1e80e7a12df8c63ee7e4519bf1a56b899f8 100644 (file)
--- a/src/HDFPersist/HDFgroup.cc
+++ b/src/HDFPersist/HDFgroup.cc
@@ -24,11 +24,8 @@
 //  File   : HDFgroup.cc
 //  Module : SALOME
 //
-extern "C"
-{
 #include "hdfi.h"
 #include <string.h>
-}
 #include "HDFgroup.hxx"
 #include "HDFexception.hxx"
 

diff --git a/src/HDFPersist/HDFgroup.hxx b/src/HDFPersist/HDFgroup.hxx
index 87f29416422e6748923ddf253330bbccd98a5fc1..ac137213f146d89a1da4ed7644777185719ca727 100644 (file)
--- a/src/HDFPersist/HDFgroup.hxx
+++ b/src/HDFPersist/HDFgroup.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFGROUP_HXX
 #define HDFGROUP_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFcontainerObject.hxx"
 #include "HDFexport.hxx"
 

diff --git a/src/HDFPersist/HDFinternalObject.cc b/src/HDFPersist/HDFinternalObject.cc
index fa10958c12e49061aea2d4aaf30db9313c9ca550..d1b3345c07ef5aca08b1ca4b6b60346702e36654 100644 (file)
--- a/src/HDFPersist/HDFinternalObject.cc
+++ b/src/HDFPersist/HDFinternalObject.cc
@@ -24,10 +24,7 @@
 //  File   : HDFinternalObject.cc
 //  Module : SALOME
 //
-extern "C"
-{
 #include "hdfi.h"
-}
 #include "HDFinternalObject.hxx"
 
 HDFinternalObject::HDFinternalObject(const char *name)

diff --git a/src/HDFPersist/HDFinternalObject.hxx b/src/HDFPersist/HDFinternalObject.hxx
index 085248434d742ea6680cff5ea7770262bce7a541..97597260acaca2cb18c765cc79c9bcfc462dc8d4 100644 (file)
--- a/src/HDFPersist/HDFinternalObject.hxx
+++ b/src/HDFPersist/HDFinternalObject.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFINTERNALOBJECT_HXX
 #define HDFINTERNALOBJECT_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFobject.hxx"
 #include "HDFexport.hxx"
 

diff --git a/src/HDFPersist/HDFobject.cc b/src/HDFPersist/HDFobject.cc
index d04bdea6a27dfa51fcebbfd5534f382fc5a161e7..c797182a72f3e76128172e71a7e7d738e24e4156 100644 (file)
--- a/src/HDFPersist/HDFobject.cc
+++ b/src/HDFPersist/HDFobject.cc
@@ -25,10 +25,7 @@
 //  Module : SALOME
 //
 #include "HDFobject.hxx"
-extern "C"
-{
 #include "hdfi.h"
-}
 
 #include <cstring>
 #include <stdlib.h>

diff --git a/src/HDFPersist/HDFobject.hxx b/src/HDFPersist/HDFobject.hxx
index 62c143345548b61707d314405a75c6878e718109..feb50e85fb32b8b0927285d835cfdcff726a8b85 100644 (file)
--- a/src/HDFPersist/HDFobject.hxx
+++ b/src/HDFPersist/HDFobject.hxx
@@ -27,10 +27,7 @@
 #ifndef HDFOBJECT_HXX
 #define HDFOBJECT_HXX
 
-extern "C"
-{
 #include "HDFtypes.h"
-}
 #include "HDFexport.hxx"
 
 class HDFPERSIST_EXPORT HDFobject {

diff --git a/src/HDFPersist/hdfi.h b/src/HDFPersist/hdfi.h
index 2be74616a4ee53a43c70c26aff2d73e31a131b3a..9c9e3c2fce5349e322c4d1535e6a6c9c3e8963c4 100644 (file)
--- a/src/HDFPersist/hdfi.h
+++ b/src/HDFPersist/hdfi.h
@@ -33,6 +33,9 @@
 
 /* HDF C INTERFACE */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /* File Interface */
 extern
 hdf_idt HDFfileCreate(char *name);
@@ -126,5 +129,8 @@ hdf_err HDFobjectIdentify(hdf_idt fid,const char *path,int i,char *name);
 
 extern
 hdf_err HDFobjectType(hdf_idt id, char *name, hdf_object_type *type);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* HDFI_H */