Changeset 139

Timestamp:

12/13/10 11:48:42 (13 years ago)

Author:

hozdoba

Message:

correctif temporaire

Location:

XMLIO_V2/dev/dev_rv

Files:

• bld.cfg (modified) (1 diff)
• src/XMLIO/calendar_utils.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/bld.cfg

@@ -33 +33 @@
 bld::tool::cppflags  -I${PWD}/../external/include
 bld::tool::ld        %LINKER
-bld::tool::ldflags   %LD_FLAGS -L${PWD}/../external/lib -lPOCO_XML -lPOCO_Foundation -lpthread
-bld::tool::cflags    %CFLAGS -I${PWD}/../external/include
+bld::tool::ldflags   %LD_FLAGS -L${PWD}/../external/lib -L/local/XMLIOSERVER_DEV/dev_rv/netcdf-4.1.1/final/lib/ -lnetcdf_c++ -lnetcdf -lhdf5_hl -lhdf5 -lz -lblitz -lPOCO_XML -lPOCO_Foundation -lpthread -lstdc++
+bld::tool::cflags    %CFLAGS -I${PWD}/../external/include -I/local/XMLIOSERVER_DEV/dev_rv/netcdf-4.1.1/final/include/
 bld::tool::fflags    %FFLAGS
 

XMLIO_V2/dev/dev_rv/src/XMLIO/calendar_utils.hpp

@@ -166 +166 @@
       // TODO :: Vérifier que les deux dates (dt0 et dt1) ont une référence vers le même calendrier.
       Duration dur =
-      { dt0.getYear() - dt1.getYear(), dt0.getMonth()  - dt1.getMonth() , dt0.getDay()    - dt1.getDay(),
-        dt0.getHour() - dt1.getHour(), dt0.getMinute() - dt1.getMinute(), dt0.getSecond() - dt1.getSecond() };
+      { (double)(dt0.getYear()   - dt1.getYear()),   (double)(dt0.getMonth()  - dt1.getMonth()),
+        (double)(dt0.getDay()    - dt1.getDay()),    (double)(dt0.getHour()   - dt1.getHour()) ,
+        (double)(dt0.getMinute() - dt1.getMinute()), (double)(dt0.getSecond() - dt1.getSecond()) };
       return (dur.resolve(dt0.getRelCalendar()));
    }