Commit 795c65c0 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

refs #5368 fix unused warning on osx, and really stupid include file ordering issue


git-svn-id: file:///svn/toku/tokudb@48887 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7cd66493
...@@ -164,7 +164,7 @@ if (APPLE) ...@@ -164,7 +164,7 @@ if (APPLE)
if (CMAKE_GENERATOR STREQUAL Xcode) if (CMAKE_GENERATOR STREQUAL Xcode)
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
else () else ()
set(CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}") add_definitions(-stdlib=libc++)
endif () endif ()
endif () endif ()
......
...@@ -25,7 +25,7 @@ typedef cpuset_t toku_cpuset_t; ...@@ -25,7 +25,7 @@ typedef cpuset_t toku_cpuset_t;
// dummy implementation to get rid of unused warnings etc // dummy implementation to get rid of unused warnings etc
typedef int toku_cpuset_t; typedef int toku_cpuset_t;
# define TOKU_CPU_ZERO(p) (*p = 0) # define TOKU_CPU_ZERO(p) (*p = 0)
# define TOKU_CPU_SET(n, p) ((void) (n, p)) # define TOKU_CPU_SET(n, p) (((void) n, (void) p))
#endif #endif
// see sched_getaffinity(2) // see sched_getaffinity(2)
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
#ident "Copyright (c) 2007-2012 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2007-2012 Tokutek Inc. All rights reserved."
#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it." #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
#include "test.h"
#include <stdlib.h> #include <stdlib.h>
#include <util/doubly_linked_list.h> #include <util/doubly_linked_list.h>
#include "test.h"
using namespace toku; using namespace toku;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment