Changeset 9079 for trunk/MagicSoft/Mars/mbase/MParEmulated.h

Timestamp:

08/04/08 12:15:20 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParEmulated.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MParEmulated.h

@@ -14 +14 @@
 #ifndef __CINT__
 #if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
-    TStreamerInfo *GetStreamerInfo(const TString &clsname) const;
+    TStreamerInfo *GetStreamerInfo(const TString &cls, TVirtualCollectionProxy* &proxy, Int_t &offset) const;
+    TStreamerInfo *GetStreamerInfo(const TString &cls, Int_t &offset) const
+    {
+        TVirtualCollectionProxy *proxy = 0; return GetStreamerInfo(cls, proxy, offset);
+    }
 #else
-    TVirtualStreamerInfo *GetStreamerInfo(const TString &clsname) const;
+    TVirtualStreamerInfo *GetStreamerInfo(const TString &cls, TVirtualCollectionProxy* &proxy, Int_t &offset) const;
+    TVirtualStreamerInfo *GetStreamerInfo(const TString &cls, Int_t &offset) const
+    {
+        TVirtualCollectionProxy *proxy = 0; return GetStreamerInfo(cls, proxy, offset);
+    }
 #endif
 #endif
-    TMethodCall *GetMethodCall(const char *get, Int_t offset) const;
+    TMethodCall *GetMethodCall(const char *get, Int_t offset, TVirtualCollectionProxy *proxy=0) const;
 
 public:
@@ -28 +36 @@
     Byte_t **GetPtr() { return &fPtr; }
 
-    Int_t    GetInt(Int_t offset) const { return *reinterpret_cast<Int_t*>   (fPtr+offset); }
-    Double_t GetDouble(Int_t offset) const { return *reinterpret_cast<Double_t*>(fPtr+offset); }
+    int      GetInt(Int_t offset) const { return *reinterpret_cast<int*>(fPtr+offset); }
+    Int_t    GetInt_t(Int_t offset) const { return *reinterpret_cast<Int_t*>(fPtr+offset); }
+    double   GetDouble(Int_t offset) const { return *reinterpret_cast<double*>(fPtr+offset); }
+    unsigned long long GetULongLong(Int_t offset) const { return *reinterpret_cast<unsigned long long*>(fPtr+offset); }
+
+    int      GetPInt(TVirtualCollectionProxy *proxy, Int_t offset) const;
+    Int_t    GetPInt_t(TVirtualCollectionProxy *proxy, Int_t offset) const;
+    double   GetPDouble(TVirtualCollectionProxy *proxy, Int_t offset) const;
+    unsigned long long GetPULongLong(TVirtualCollectionProxy *proxy, Int_t offset) const;
 
     TMethodCall *GetterMethod(const char *name, TString cls, Int_t offset=0) const;