← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-164

« back to all changes in this revision

Viewing changes to drizzled/dtoa.cc

  • Committer: Continuous Integration
  • Date: 2013-01-24 09:10:38 UTC
  • mfrom: (2616.1.1 7.2)
  • Revision ID: ci@drizzle.org-20130124091038-cg9n2npx2laqyr90
Merge lp:~brianaker/drizzle/warning-cleanup Build: jenkins-Drizzle-Builder-155

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/dtoa.cc
39
39
 
40
40
#include <drizzled/internal/m_string.h>  /* for memcpy and NOT_FIXED_DEC */
41
41
 
42
 
#include <float.h>
 
42
#include <cfloat>
43
43
 
44
44
#include <cstdlib>
45
45
#include <cerrno>
46
46
#include <algorithm>
47
47
 
 
48
#include "drizzled/compare_double.h"
 
49
 
48
50
using namespace std;
49
51
 
50
52
namespace drizzled
1506
1508
        else
1507
1509
          word1(rv)&= 0xffffffff << j;
1508
1510
      }
1509
 
      if (!dval(rv))
 
1511
      if (compare_double(dval(rv), 0))
1510
1512
      {
1511
1513
 undfl:
1512
1514
          dval(rv)= 0.;