Bug#28672824 Fix Solaris Warnings

Author: silvakid

CMakeLists.txt

@@ -505,15 +505,10 @@ else()
   set(TEST_COMPILE_FLAGS "-Wno-sign-compare")
 
   if(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
-
-    # TODO: Fix these warnings
-
     add_compile_options(
-      -errtags=yes -erroff=hidevf,wvarhidemem
+      -errtags=yes
     )
-
   else()
-
     add_compile_options(-Wextra)
 
   endif()

common/op_impl.h

@@ -41,6 +41,12 @@
 #include <bitset>
 #include <list>
 
+#if defined __SUNPRO_CC
+
+//Disable warning of virtual methods being hidden
+#pragma error_messages (off, hidevf)
+
+#endif
 
 /*
   This file defines a hierarchy of classes which implement executable objects
@@ -2576,6 +2582,12 @@ class Op_table_remove
 
 };
 
+#if defined __SUNPRO_CC
+
+#pragma error_messages (default, hidevf)
+
+#endif
+
 
 }  // internal
 }  // mysqlx

common/session.cc

@@ -325,12 +325,12 @@ void Settings_impl::get_data_source(cdk::ds::Multi_source &src)
 
     assert(Option_impl::SOCKET == it->first);
 
-    string socket = it->second.get_string();
+    string socket_path = it->second.get_string();
     ++it;
 
     check_prio(it, prio);
 
-    src.add(cdk::ds::Unix_socket(socket),
+    src.add(cdk::ds::Unix_socket(socket_path),
       (cdk::ds::Unix_socket::Options&)opts,
       (unsigned short)prio);
 

devapi/tests/session-t.cc

@@ -1802,7 +1802,7 @@ TEST_F(Sess, pool_ttl)
                                            ));
     }
 
-    auto test_sessions = [&session_list,max_connections] (bool expect_errors = false)
+    auto test_sessions = [&session_list,max_connections] (bool expect_errors)
     {
       int errors_found = 0;
       while(session_list.size() > 0)
@@ -1844,7 +1844,7 @@ TEST_F(Sess, pool_ttl)
       }
     };
 
-    test_sessions();
+    test_sessions(false);
 
     // Now closing pool so that waiting threads get session without timeout
     ClientSettings settings1 = settings;
@@ -1972,4 +1972,3 @@ TEST_F(Sess, pool_ttl)
   }
 
 }
-