← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/atomics.h

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/atomics.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
5
5
 *  Copyright 2005-2008 Intel Corporation.  All Rights Reserved.
6
6
 *
7
7
 *  This program is free software; you can redistribute it and/or modify
24
24
# if defined(__SUNPRO_CC)
25
25
#  include <drizzled/atomic/sun_studio.h>
26
26
# endif
27
 
# if !defined(__ICC) && !defined(__clang__) && (defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(__SUNPRO_CC))
 
27
# if !defined(__ICC) && (defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(__SUNPRO_CC))
28
28
#  include <drizzled/atomic/gcc_traits.h>
29
29
#  define ATOMIC_TRAITS internal::gcc_traits
30
30
# else  /* use pthread impl */