Skip to content

Commit

Permalink
Merge pull request #197 from sarahgaiser/cpp17_changes
Browse files Browse the repository at this point in the history
make hpstr work with C++17 standard
  • Loading branch information
cbravo135 authored Jul 29, 2024
2 parents 5a73410 + 37b402c commit 05a1cac
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.18)

project(hpstr)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_C_STANDARD 14)
set(CMAKE_C_STANDARD 17)
set(CMAKE_C_STANDARD_REQUIRED ON)

if(NOT CMAKE_BUILD_TYPE)
Expand Down
2 changes: 1 addition & 1 deletion processors/src/StdhepMCParticleProcessor.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ bool StdhepMCParticleProcessor::process() {
mc_particles_.clear();
}

std::auto_ptr<IMPL::LCEventImpl> evt( new IMPL::LCEventImpl() ) ;
std::unique_ptr<IMPL::LCEventImpl> evt( new IMPL::LCEventImpl() ) ;
evt->setRunNumber(0) ;
evt->setEventNumber(count) ;

Expand Down
2 changes: 1 addition & 1 deletion processors/src/SvtRawDataAnaProcessor.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void SvtRawDataAnaProcessor::initialize(TTree* tree) {
std::ifstream myfile2(timeProfiles_.data());
std::string s;
std::string s2;
std::vector<float [12]> baselines;
// std::vector<float [12]> baselines;
for(int i=0; i<24576; i++){
std::getline(myfile,s);
std::getline(myfile2,s2);
Expand Down

0 comments on commit 05a1cac

Please sign in to comment.