Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

[modules/kernel.git] / src / Batch / Batch_Date.cxx

diff --git a/src/Batch/Batch_Date.cxx b/src/Batch/Batch_Date.cxx
index 9c48d233db3d09573c1e4c862211a4375a3ef777..bc99d9764137929034d2e3951233d9b0f48a0146 100644 (file)
--- a/src/Batch/Batch_Date.cxx
+++ b/src/Batch/Batch_Date.cxx
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 /*
  * Date.cxx : 
  *
@@ -17,7 +38,8 @@ namespace Batch {
 
   Date::Date(const long l)
   {
-    struct tm * p_tm = localtime(&l);
+    time_t l_t = l;
+    struct tm * p_tm = localtime(&l_t);
     _day   = p_tm->tm_mday;
     _month = p_tm->tm_mon  + 1;
     _year  = p_tm->tm_year + 1900;
@@ -30,7 +52,8 @@ namespace Batch {
   { 
     if ((s == "now") ||        (s == "Now") || (s == "NOW")) {
       long l = time(0);
-      struct tm * p_tm = localtime(&l);
+      time_t l_t = l;
+      struct tm * p_tm = localtime(&l_t);
       _day   = p_tm->tm_mday;
       _month = p_tm->tm_mon  + 1;
       _year  = p_tm->tm_year + 1900;
@@ -39,7 +62,7 @@ namespace Batch {
       _sec   = p_tm->tm_sec;
 
     } else {
-      char c;
+//      char c;
 //       istringstream ist(s);
 //       ist >> _day   >> c
 //       >> _month >> c
@@ -53,7 +76,8 @@ namespace Batch {
 
   Date & Date::operator =(long l)
   {
-    struct tm * p_tm = localtime(&l);
+    time_t l_t = l;
+    struct tm * p_tm = localtime(&l_t);
     _day   = p_tm->tm_mday;
     _month = p_tm->tm_mon  + 1;
     _year  = p_tm->tm_year + 1900;
@@ -92,7 +116,8 @@ namespace Batch {
   {
     if ((s == "now") ||        (s == "Now") || (s == "NOW")) {
       long l = time(0);
-      struct tm * p_tm = localtime(&l);
+      time_t l_t = l;
+      struct tm * p_tm = localtime(&l_t);
       _day   = p_tm->tm_mday;
       _month = p_tm->tm_mon  + 1;
       _year  = p_tm->tm_year + 1900;
@@ -101,7 +126,7 @@ namespace Batch {
       _sec   = p_tm->tm_sec;
 
     } else {
-      char c;
+//       char c;
 //       istringstream ist(s);
 //       ist >> _day   >> c
 //       >> _month >> c