sync

CMakeLists.txt

@@ -39,11 +39,14 @@ endif()
 
 # Compiler specific options.
 # Note -Wno-deprecated-register is to suppress bison errors.
-if ((CMAKE_CXX_COMPILER_ID MATCHES AppleClang|Clang)
-    OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
+if (CMAKE_CXX_COMPILER_ID MATCHES AppleClang|Clang)
   set(STA_COMPILE_OPTIONS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security -Wno-deprecated-register)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  set(STA_COMPILE_OPTIONS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security)
+endif()
+
 message(STATUS "System name: ${CMAKE_SYSTEM_NAME}")
 message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")

tcl/StaTcl.i

@@ -166,12 +166,6 @@ cmdGraph()
   return Sta::sta()->ensureGraph();
 }
 
-// These should be templated, but Sun's compiler can't deal with
-// an explicit template instantiation (ie, the arglist is the same
-// for all these functions).  Adding a dummy argument of the return
-// type is not sufficient because then it chokes on the call to
-// SWIG_ConvertPtr because it is declared extern "C".
-
 template <class TYPE>
 Vector<TYPE> *
 tclListSeq(Tcl_Obj *const source,

util/Machine.hh

@@ -26,23 +26,8 @@
   #define __attribute__(x)
 #endif // __GNUC__
 
-#ifdef __SUNPRO_CC
-  // SunCC will not allow numeric limits in array subscript
-  // declarations so use define instead.
-  #define INT_DIGITS 10
-  // Prevent SunCC/Rogue Wave's brain dead STL allocator from
-  // pre-allocating excessive memory.
-  // Note well:
-  //   For this to work it MUST be included before any STL libraries
-  //   that may include <memory>.
-  //   This def is intentionally NOT guarded by #ifndef's so that compiler
-  //   warnings are emitted if this file is included after <memory> is included.
-  #undef _RWSTD_CONTAINER_BUFFER_SIZE
-  #define _RWSTD_CONTAINER_BUFFER_SIZE 16
-#else
-  // Requires #include <limits> if referenced.
-  #define INT_DIGITS std::numeric_limits<int>::digits10
-#endif // __SUNPRO_CC
+// Requires #include <limits> if referenced.
+#define INT_DIGITS std::numeric_limits<int>::digits10
 
 #ifdef _MSC_VER
   // Microcruft Visual C++