]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
gcc 3.3.6 complains about 'inline static'. Use 'static inline' instead.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 1 Jul 2010 18:05:26 +0000 (18:05 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 1 Jul 2010 18:05:26 +0000 (18:05 +0000)
git-svn-id: https://svn.dealii.org/trunk@21435 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/boost/include/boost/date_time/c_time.hpp

index 24ccfe5c37dfdb865aa01ba330b470ae9cbc6970..04416a69b97dbb515018e6cce9aa64e94bf34d8f 100644 (file)
@@ -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)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.