← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/my_time.cc

  • Committer: Monty Taylor
  • Date: 2010-02-04 08:14:46 UTC
  • mfrom: (1277.2.1 build) (1280.2.1 build)
  • mto: This revision was merged to the branch mainline in revision 1283.
  • Revision ID: mordred@inaugust.com-20100204081446-ldh9m486va30uap6
Put everything in drizzled into drizzled namespace.
Put internal stuff into drizzled::internal namespace.
Removed some cruft.
Now every symbol that is shipped in a header is in the drizzled namespace
and everything in the server that's not shipped is labeled internal. woot. 
Removed a lot of the extra extern "C" stuff that was in there. Less ugliness for
internal callbacks now for Sun Studio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/my_time.cc
13
13
 along with this program; if not, write to the Free Software
14
14
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#include "drizzled/internal/mysys_priv.h"
 
16
#include "config.h"
17
17
 
18
 
#include "my_time.h"
 
18
#include "drizzled/my_time.h"
19
19
 
20
20
#include "drizzled/internal/m_string.h"
21
21
#include "drizzled/charset_info.h"
22
22
#include <drizzled/util/test.h>
 
23
#include "drizzled/definitions.h"
23
24
 
24
 
#include <stdio.h>
 
25
#include <cstdio>
25
26
#include <algorithm>
26
27
 
27
28
using namespace std;
28
29
 
 
30
namespace drizzled
 
31
{
 
32
 
29
33
static int check_time_range(DRIZZLE_TIME *my_time, int *warning);
30
34
 
31
35
/* Windows version of localtime_r() is declared in my_ptrhead.h */
570
574
    /* Fix the date to assume that seconds was given */
571
575
    if (!found_hours && !found_days)
572
576
    {
573
 
      bmove_upp((unsigned char*) (date+4), (unsigned char*) (date+state),
 
577
      internal::bmove_upp((unsigned char*) (date+4), (unsigned char*) (date+state),
574
578
                sizeof(long)*(state-1));
575
579
      memset(date, 0, sizeof(long)*(4-state));
576
580
    }
1253
1257
  return 0;
1254
1258
}
1255
1259
 
 
1260
} /* namespace drizzled */