libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix fno-exceptions

This commit is contained in:
Phillip Stephens 2015-10-16 16:42:23 -07:00
parent b9d79a9581
commit 1b67cce607
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Example/CMakeLists.txt
View File

@ -1,11 +1,15 @@
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(Example) project(Example)
endif()
include_directories(${ATHENA_INCLUDE_DIR}) include_directories(${ATHENA_INCLUDE_DIR})
add_executable(Example add_executable(Example
main.cpp) main.cpp)
if(GEKKO) if(GEKKO)
include_directories(${LIBOGCDIR}/include)
link_directories(${LIGOGCDIR}/lib/wii)
target_link_libraries(Example AthenaCore z wiiuse bte ogc m) target_link_libraries(Example AthenaCore z wiiuse bte ogc m)
else() else()
#TODO: add normal link libraries #TODO: add normal link libraries

12
src/Athena/FileInfo.cpp
View File

@ -172,23 +172,17 @@ bool FileInfo::touch() const
#elif (defined(HW_RVL) || defined(HW_DOL)) && defined(GEKKO) #elif (defined(HW_RVL) || defined(HW_DOL)) && defined(GEKKO)
// Generic portable version, not extremely reliable but does work // Generic portable version, not extremely reliable but does work
atUint64 val = 0xCDCDCDCDCD; atUint64 val = 0xCDCDCDCDCD;
try
{ {
Athena::io::FileReader reader(m_path.c_str()); Athena::io::FileReader reader(m_path.c_str());
if (reader.isOpen())
val = reader.readUint64(); val = reader.readUint64();
} }
catch(...)
{
}
try
{ {
Athena::io::FileWriter writer(m_path, false); Athena::io::FileWriter writer(m_path, false);
if (val != 0xCDCDCDCDCD) if (val != 0xCDCDCDCDCD && writer.isOpen())
writer.writeUint64(val); writer.writeUint64(val);
} else if (!writer.isOpen())
catch(...)
{
return false; return false;
} }