Revision: 54945
http://brlcad.svn.sourceforge.net/brlcad/?rev=54945&view=rev
Author: brlcad
Date: 2013-03-28 17:49:05 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
upon closer inspection, it looks like boost just did exactly what I had
originally planned to do anyways, namely calling the pthread and win32 TLS api,
so strip out the boost hooks. it's not worth having the additional compilation
complexity to get boost_thread compiling cleanly and the major third-party dep
it would be adding to libbu. we can just do our own thing here in far far
fewer lines of code, far less integration complexity.
Modified Paths:
--------------
brlcad/trunk/src/libbu/CMakeLists.txt
brlcad/trunk/src/libbu/thread.cpp
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2013-03-28 17:45:19 UTC (rev
54944)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2013-03-28 17:49:05 UTC (rev
54945)
@@ -3,18 +3,8 @@
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${TCL_INCLUDE_DIRS}
- ${CMAKE_SOURCE_DIR}/src/other/boost
)
-# No point halting on C++ warnings, we can't do anything about the
-# boost issues (except update boost)
-string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
-if(BUILD_TYPE)
- set(CMAKE_CXX_FLAGS_${BUILD_TYPE} "${CMAKE_CXX_FLAGS_${BUILD_TYPE}}
-Wno-error")
-else(BUILD_TYPE)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error")
-endif(BUILD_TYPE)
-
# locally used but not needed by users of the library
set(BU_LOCAL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
@@ -104,7 +94,7 @@
xdr.c
)
-BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${TCL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${M_LIBRARY};boost_thread")
+BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${TCL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${M_LIBRARY}")
set_target_properties(libbu PROPERTIES VERSION 20.0.1 SOVERSION 20)
get_directory_property(BRLCAD_TCL_BUILD DIRECTORY
${BRLCAD_SOURCE_DIR}/src/other DEFINITION BRLCAD_TCL_BUILD)
if("${BRLCAD_TCL_BUILD}" STREQUAL "ON")
Modified: brlcad/trunk/src/libbu/thread.cpp
===================================================================
--- brlcad/trunk/src/libbu/thread.cpp 2013-03-28 17:45:19 UTC (rev 54944)
+++ brlcad/trunk/src/libbu/thread.cpp 2013-03-28 17:49:05 UTC (rev 54945)
@@ -20,23 +20,22 @@
#include "common.h"
-#include <boost/thread/tss.hpp>
+//static boost::thread_specific_ptr<int> thread_cpu;
+//__thread int thread_cpu;
+//__declspec(thread) int thread_cpu;
-static boost::thread_specific_ptr<int> thread_cpu;
-
extern "C" {
void
-thread_set_cpu(int cpu)
+thread_set_cpu(int UNUSED(cpu))
{
- thread_cpu.reset(new int(cpu));
}
int
thread_get_cpu(void)
{
- return *thread_cpu.get();
+ return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
