Changeset f1eb838 in tol

Timestamp:

Mar 9, 2011, 5:18:51 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

48ff793

Parents:

dffeb26

Message:

Refs #827
El tamaño del tipo puntero depende de la arquitectura de la máquina así como del compilador utilizado, por lo que es conveniente guardar su valor en la cabecera del OIS

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3284 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/OIS

Files:

• oisxml.cpp (modified) (3 diffs)
• tol_ois.h (modified) (2 diffs)

tol/OIS/oisxml.cpp

@@ -71 +71 @@
 
   header_->Print("<typeSizes>\n");
+  header_->Print("<pointer>%d</pointer>\n",                       control_.typeSizes_.sizeof_pointer_);
   header_->Print("<char>%d</char>\n",                             control_.typeSizes_.sizeof_char_);
   header_->Print("<short>%d</short>\n",                           control_.typeSizes_.sizeof_short_);
@@ -377 +378 @@
   {
     XMLEnsure(XMLGetNextTagTitle(tag_, "typeSizes"));
+    if(control_.oisEngine_.oisVersion_>="02.16") {
+    XMLEnsure(XMLGetNextTagValue(tag_, value_, "pointer"));    sscanf(value_,"%hd",&control_.typeSizes_.sizeof_pointer_); }    
     XMLEnsure(XMLGetNextTagValue(tag_, value_, "char"));       sscanf(value_,"%hd",&control_.typeSizes_.sizeof_char_);
     XMLEnsure(XMLGetNextTagValue(tag_, value_, "short"));      sscanf(value_,"%hd",&control_.typeSizes_.sizeof_short_);
@@ -391 +394 @@
   else
   {
+    control_.typeSizes_.sizeof_pointer_    =  4;
     control_.typeSizes_.sizeof_char_       =  1;
     control_.typeSizes_.sizeof_short_      =  2;
     control_.typeSizes_.sizeof_int_        =  4;
     control_.typeSizes_.sizeof_BINT64_     =  8;
+    control_.typeSizes_.sizeof_size_t_     =  4;
     control_.typeSizes_.sizeof_double_     =  8;
     control_.typeSizes_.sizeof_BDat_       = 12;

tol/OIS/tol_ois.h

@@ -173 +173 @@
     {
      public:     
+      short sizeof_pointer_;        
       short sizeof_char_;        
       short sizeof_short_;       
@@ -184 +185 @@
 
       TypeSizes() 
-      : sizeof_char_       (sizeof(char)),
+      : sizeof_pointer_    (sizeof(void*)),
+        sizeof_char_       (sizeof(char)),
         sizeof_short_      (sizeof(short)),
         sizeof_int_        (sizeof(int)),