From: bangerth Date: Thu, 1 Jul 2010 18:05:26 +0000 (+0000) Subject: gcc 3.3.6 complains about 'inline static'. Use 'static inline' instead. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dc99d1f5acaa62e2e5d2c6b3f5e499d6ea90f7a;p=dealii-svn.git gcc 3.3.6 complains about 'inline static'. Use 'static inline' instead. git-svn-id: https://svn.dealii.org/trunk@21435 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/boost/include/boost/date_time/c_time.hpp b/deal.II/contrib/boost/include/boost/date_time/c_time.hpp index 24ccfe5c37..04416a69b9 100644 --- a/deal.II/contrib/boost/include/boost/date_time/c_time.hpp +++ b/deal.II/contrib/boost/include/boost/date_time/c_time.hpp @@ -53,8 +53,8 @@ namespace date_time { public: #if defined(BOOST_DATE_TIME_HAS_REENTRANT_STD_FUNCTIONS) //! requires a pointer to a user created std::tm struct - inline - static std::tm* localtime(const std::time_t* t, std::tm* result) + static + inline std::tm* localtime(const std::time_t* t, std::tm* result) { // localtime_r() not in namespace std??? result = localtime_r(t, result); @@ -63,8 +63,8 @@ namespace date_time { return result; } //! requires a pointer to a user created std::tm struct - inline - static std::tm* gmtime(const std::time_t* t, std::tm* result) + static + inline std::tm* gmtime(const std::time_t* t, std::tm* result) { // gmtime_r() not in namespace std??? result = gmtime_r(t, result); @@ -79,8 +79,8 @@ namespace date_time { #pragma warning(disable : 4996) // disable depricated localtime/gmtime warning on vc8 #endif // _MSC_VER >= 1400 //! requires a pointer to a user created std::tm struct - inline - static std::tm* localtime(const std::time_t* t, std::tm* result) + static + inline std::tm* localtime(const std::time_t* t, std::tm* result) { result = std::localtime(t); if (!result) @@ -88,8 +88,8 @@ namespace date_time { return result; } //! requires a pointer to a user created std::tm struct - inline - static std::tm* gmtime(const std::time_t* t, std::tm* result) + static + inline std::tm* gmtime(const std::time_t* t, std::tm* result) { result = std::gmtime(t); if (!result)