Skip to content
Permalink
Browse files

Merge branch 'ob-10.0' into 10.0

  • Loading branch information...
Buggynours committed Aug 8, 2015
2 parents 8ab46a5 + 5f53303 commit 0eacebf167daeeabcc3c60f0675db2aa75b7e033
Showing with 4 additions and 2 deletions.
  1. +2 −1 storage/connect/reldef.h
  2. +2 −1 storage/connect/tabdos.cpp
@@ -193,7 +193,8 @@ class DllExport COLDEF : public COLCRT { /* Column description block
friend class COLBLK;
friend class DBFFAM;
friend class TDBASE;
public:
friend class TDBDOS;
public:
COLDEF(void); // Constructor

// Implementation
@@ -2018,7 +2018,8 @@ int TDBDOS::EstimatedLength(void)
// result if we set dep to 1
dep = 1 + cdp->GetLong() / 20; // Why 20 ?????
} else for (; cdp; cdp = cdp->GetNext())
dep = MY_MAX(dep, cdp->GetOffset());
if (!(cdp->Flags & (U_VIRTUAL|U_SPECIAL)))
dep = MY_MAX(dep, cdp->GetOffset());

return (int)dep;
} // end of Estimated Length

0 comments on commit 0eacebf

Please sign in to comment.
You can’t perform that action at this time.