Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change pointer to shared_ptr #671

Merged
merged 40 commits into from
Apr 30, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2808dc5
change point to uniq/shared ptr
bam241 Apr 7, 2020
a2d6f24
turned MBI into a unique_ptr
bam241 Apr 7, 2020
c5a954b
firace add c++ 11
bam241 Apr 7, 2020
b93dc9b
no need to force it
bam241 Apr 7, 2020
ab729dc
switching from unique to shared
bam241 Apr 7, 2020
d483256
forcing c++11
bam241 Apr 7, 2020
9d955aa
Add indent
bam241 Apr 7, 2020
f31eb12
removing it ?
bam241 Apr 7, 2020
2f17c8c
revseting the DAMC_macro
bam241 Apr 7, 2020
967353b
empty commit
bam241 Apr 7, 2020
67ffa6c
foircing back c++11
bam241 Apr 7, 2020
b78c085
add c++11 in test
bam241 Apr 7, 2020
e415a8f
convert from pointer to shared_ptr...
bam241 Apr 8, 2020
c147bd0
revert to std c++11 cmake setup
bam241 Apr 8, 2020
70de322
revert to force c++11
bam241 Apr 8, 2020
02c2a98
readd previous option
bam241 Apr 8, 2020
8332b18
and now ?
bam241 Apr 8, 2020
b4b3029
this is clean
bam241 Apr 8, 2020
2c48814
adding news
bam241 Apr 9, 2020
51a5048
Update src/dagmc/DagMC.cpp
bam241 Apr 9, 2020
4142a7f
Apply suggestions from code review
bam241 Apr 9, 2020
d9548da
Apply suggestions from code review
bam241 Apr 9, 2020
d559e51
add a deprecated constructor
bam241 Apr 10, 2020
dee0d47
vifx news name
bam241 Apr 10, 2020
5339237
adding new getter for share_ptr, and deprecate old ones
bam241 Apr 10, 2020
73b5eaf
changed test to shape_ptr
bam241 Apr 10, 2020
e5204af
change raw pointer for all shared_ptr in dagmc test
bam241 Apr 10, 2020
8e9a2bd
fixing style
bam241 Apr 10, 2020
075cec7
remove unnecessary includes
bam241 Apr 10, 2020
5715833
update news
bam241 Apr 10, 2020
2dd8c83
Update src/dagmc/DagMC.cpp
bam241 Apr 10, 2020
ff99edc
do not return shared_ptr anymore
bam241 Apr 10, 2020
407c83d
change to unique ptr
bam241 Apr 13, 2020
cb79661
attempt to fix unique_ptr
bam241 Apr 13, 2020
53f5110
thx @pshriwise for solving that one !
bam241 Apr 13, 2020
59dbae4
now return a shared_ptre for GTT and allows to retrieve MBI shared_ptr
bam241 Apr 16, 2020
96e9aca
set MBI_shared_ptr ass a nullptr when MBI passed as raw pointer
bam241 Apr 16, 2020
24317b0
return the correct MBI version
bam241 Apr 16, 2020
c7e7a8c
reorder incldues, add runtime_error when trying to return MBI as a sh…
bam241 Apr 27, 2020
3088944
update news details
bam241 Apr 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert to std c++11 cmake setup
  • Loading branch information
bam241 committed Apr 8, 2020
commit c147bd002540be2adca2969ae8b531270cbdc0cf
9 changes: 1 addition & 8 deletions cmake/DAGMC_macros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,8 @@ endmacro ()

macro (dagmc_setup_flags)
message("")
# check for and enable c++11 support
INCLUDE(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
IF(COMPILER_SUPPORTS_CXX11)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ELSE()
MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
ENDIF()

set(CMAKE_CXX_STANDARD 11)

if (BUILD_PIC)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
Expand Down
9 changes: 0 additions & 9 deletions cmake/test_config/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ cmake_minimum_required(VERSION 2.8)

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})

# check for and enable c++11 support
INCLUDE(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
IF(COMPILER_SUPPORTS_CXX11)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ELSE()
MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
ENDIF()

find_package(DAGMC REQUIRED)

link_directories(${DAGMC_LIBRARY_DIRS})
Expand Down