eerste fröbelwerk

CMakeLists.txt

@@ -40,7 +40,7 @@ include(Dart)
 include(GenerateExportHeader)
 
 set(CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -395,7 +395,8 @@ if(CIFPP_BUILD_TESTS)
 		rename-compound
 		structure
 		sugar
-		unit)
+		unit
+		unit-v2)
 
 	foreach(CIFPP_TEST IN LISTS CIFPP_tests)
 		set(CIFPP_TEST "${CIFPP_TEST}-test")

cmake/FindAtomic.cmake

@@ -12,7 +12,7 @@ include(CheckCXXSourceRuns)
 
 cmake_push_check_state()
 
-set(CMAKE_CXX_STANDARD 17)
+# set(CMAKE_CXX_STANDARD 17)
 
 check_include_file_cxx("atomic" _CXX_ATOMIC_HAVE_HEADER)
 mark_as_advanced(_CXX_ATOMIC_HAVE_HEADER)

cmake/FindFilesystem.cmake

@@ -12,7 +12,7 @@ include(CheckCXXSourceCompiles)
 
 cmake_push_check_state()
 
-set(CMAKE_CXX_STANDARD 17)
+# set(CMAKE_CXX_STANDARD 17)
 
 check_include_file_cxx("filesystem" _CXX_FILESYSTEM_HAVE_HEADER)
 mark_as_advanced(_CXX_FILESYSTEM_HAVE_HEADER)

src/CifUtils.cpp

@@ -835,7 +835,8 @@ class rsrc_data
   private:
 	rsrc_data()
 	{
-		if (gResourceIndex and (gResourceIndex[0].m_child > 0 or gResourceIndex[0].m_size > 0) and gResourceIndex and gResourceName)
+		// if (gResourceIndex and (gResourceIndex[0].m_child > 0 or gResourceIndex[0].m_size > 0) and gResourceIndex and gResourceName)
+		if (gResourceIndex[0].m_child > 0 or gResourceIndex[0].m_size > 0)
 		{
 			m_index = gResourceIndex;
 			m_data = gResourceData;
@@ -1292,7 +1293,8 @@ std::unique_ptr<std::istream> ResourcePool::load(fs::path name)
 			result = open(p2);
 	}
 
-	if (not result and gResourceData)
+	// if (not result and gResourceData)
+	if (not result and (gResourceIndex[0].m_child > 0 or gResourceIndex[0].m_size > 0))
 	{
 		mrsrc::rsrc rsrc(name);
 		if (rsrc)

src/PDB2Cif.cpp

@@ -5940,7 +5940,7 @@ int PDBFileParser::PDBChain::AlignResToSeqRes()
 	y = highY;
 
 	// C++ is getting closer to Pascal :-)
-	auto printAlignment = [=]()
+	auto printAlignment = [=,this]()
 	{
 		std::cerr << std::string(cif::get_terminal_width(), '-') << std::endl
 				  << "Alignment for chain " << mDbref.chainID << std::endl

src/TlsParser.cpp

@@ -356,12 +356,12 @@ struct TLSSelectionRangeID : public TLSSelectionAll
 		for (std::string chain: chains)
 		{
 			auto f = std::find_if(residues.begin(), residues.end(),
-				[=](auto r) -> bool {
+				[=,this](auto r) -> bool {
 					return r.chainID == chain and r.seqNr == m_first and r.iCode == m_icode_first;
 				});
 			
 			auto l = std::find_if(residues.begin(), residues.end(),
-				[=](auto r) -> bool {
+				[=,this](auto r) -> bool {
 					return r.chainID == chain and r.seqNr == m_last and r.iCode == m_icode_last;
 				});