fight warnings c++17 error throw(). Build GUI finished

diff --git a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
index b8a3933f68d06938de41f0ffa006b386d87b779d..65f841bb832d588a904322fe8fd64452d76573a4 100644 (file)
--- a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
+++ b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
@@ -26,7 +26,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_ContainerManager)
 
-PVServer_ServiceLoader::PVServer_ServiceLoader() throw(PVServer_ServiceLoader_Exception):
+PVServer_ServiceLoader::PVServer_ServiceLoader():
   myLcc( 0 )
 {
   try

diff --git a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h
index 43023382482ca654a6db83d74889ef71cb2214b2..3f6630451c7ade5611875c54c63b0913031209da 100644 (file)
--- a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h
+++ b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h
@@ -33,8 +33,8 @@ class PVSERVERSERVICELOADER_EXPORT PVServer_ServiceLoader_Exception: public std:
 {
 public:
   PVServer_ServiceLoader_Exception(const std::string & what):_what(what) {}
-  ~PVServer_ServiceLoader_Exception() throw () {}
-  virtual const char* what() const throw() { return _what.c_str(); }
+  ~PVServer_ServiceLoader_Exception() {}
+  virtual const char* what() const noexcept { return _what.c_str(); }
 private:
   std::string _what;
 };
@@ -42,7 +42,7 @@ private:
 class PVSERVERSERVICELOADER_EXPORT PVServer_ServiceLoader
 {
 public:
-  PVServer_ServiceLoader() throw(PVServer_ServiceLoader_Exception);
+  PVServer_ServiceLoader() ;
   virtual ~PVServer_ServiceLoader();
 
   //! Get the IOR of the CORBA service handling the PVServer

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index 991926b98597df97428d54e4dcd87afe8bd8c27f..4f63308173d6c78aa967535e89886e6c8ec9a546 100644 (file)
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -334,7 +334,7 @@ bool SUIT_ViewWindow::dropDownButtons() const
 */
 int SUIT_ViewWindow::getId() const
 {
-  return int(LONG_PTR(this));
+  return *((int*)(this));
 }
 
 /*!

diff --git a/src/TOOLSGUI/ToolsGUI.cxx b/src/TOOLSGUI/ToolsGUI.cxx
index 82ac3bc454c26d6d214af0d662ef154ff109faeb..372845f3729ba9dbf171bd055ffb8337f2a4eec3 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI.cxx
+++ b/src/TOOLSGUI/ToolsGUI.cxx
@@ -46,7 +46,7 @@ bool ToolsGUI::GetVisibility( _PTR(SObject) theObj,
   if ( theObj && theObj->FindAttribute( anAttr, "AttributeGraphic" ) )
   {
     _PTR(AttributeGraphic) aGraphic (anAttr);
-    return aGraphic->GetVisibility( (int)((ULONG_PTR)theId) ); //!< TODO: pointer truncation
+    return aGraphic->GetVisibility( *((int*)theId) ); //!< TODO: pointer truncation
   }
 
   return false;
@@ -71,13 +71,13 @@ bool ToolsGUI::SetVisibility( const char* theEntry,
     if ( anObj->FindAttribute( aGAttr, "AttributeGraphic" ) )
     {
       _PTR(AttributeGraphic) anAttr ( aGAttr );
-      anAttr->SetVisibility( (int)((ULONG_PTR)theId), theValue ); //!< TODO: pointer truncation
+      anAttr->SetVisibility( *((int*)theId), theValue ); //!< TODO: pointer truncation
     }
     else if ( theValue )
     {
       _PTR(StudyBuilder) aBuilder (aStudy->NewBuilder());
       _PTR(AttributeGraphic) anAttr (aBuilder->FindOrCreateAttribute(anObj, "AttributeGraphic"));
-      anAttr->SetVisibility( (int)((ULONG_PTR)theId), theValue ); //!< TODO: pointer truncation
+      anAttr->SetVisibility( *((int*)theId), theValue ); //!< TODO: pointer truncation
     }
     return true;
   }