Huge compile performance refactor

CMakeLists.txt

@@ -90,6 +90,9 @@ add_library(amuse
 if(COMMAND add_sanitizers)
   add_sanitizers(amuse)
 endif()
+if(COMMAND cotire)
+  cotire(amuse)
+endif()
 
 if(TARGET boo AND NOT WINDOWS_STORE)
   # AudioUnit Target (OS X only)

driver/amuseconv.cpp

@@ -2,8 +2,8 @@
 #include "athena/FileReader.hpp"
 #include "athena/DNAYaml.hpp"
 #include "logvisor/logvisor.hpp"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 static logvisor::Module Log("amuseconv");
 

driver/amuserender.cpp

@@ -5,15 +5,15 @@
 #include "boo/audiodev/IAudioVoiceEngine.hpp"
 #include "logvisor/logvisor.hpp"
 #include "optional.hpp"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <signal.h>
 #include <thread>
 #include <map>
 #include <set>
 #include <vector>
 #include <unordered_map>
-#include <stdarg.h>
+#include <cstdarg>
 
 static logvisor::Module Log("amuserender");
 

include/amuse/AudioGroupPool.hpp

@@ -1,7 +1,7 @@
 #ifndef __AMUSE_AUDIOGROUPPOOL_HPP__
 #define __AMUSE_AUDIOGROUPPOOL_HPP__
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <cmath>
 #include <unordered_map>

include/amuse/AudioGroupSampleDirectory.hpp

@@ -2,7 +2,7 @@
 #define __AMUSE_AUDIOGROUPSAMPLEDIR_HPP__
 
 #include <unordered_map>
-#include <stdint.h>
+#include <cstdint>
 #include "Common.hpp"
 
 namespace amuse

include/amuse/Common.hpp

@@ -3,9 +3,9 @@
 
 #include <algorithm>
 #include <limits>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdint>
+#include <cstdarg>
 #include <string>
 #include <string_view>
 #include <cstring>

include/amuse/EffectBase.hpp

@@ -1,8 +1,8 @@
 #ifndef __AMUSE_EFFECTBASE_HPP__
 #define __AMUSE_EFFECTBASE_HPP__
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 namespace amuse
 {

include/amuse/EffectChorus.hpp

@@ -3,7 +3,7 @@
 
 #include "EffectBase.hpp"
 #include "Common.hpp"
-#include <stdint.h>
+#include <cstdint>
 
 namespace amuse
 {

include/amuse/EffectDelay.hpp

@@ -4,7 +4,7 @@
 #include "EffectBase.hpp"
 #include "IBackendVoice.hpp"
 #include "Common.hpp"
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
 namespace amuse

include/amuse/Entity.hpp

@@ -1,9 +1,9 @@
 #ifndef __AMUSE_ENTITY_HPP__
 #define __AMUSE_ENTITY_HPP__
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
-#include <assert.h>
+#include <cassert>
 
 namespace amuse
 {

include/amuse/SongConverter.hpp

@@ -2,7 +2,7 @@
 #define __AMUSE_SONGCONVERTER_HPP__
 
 #include <vector>
-#include <stdint.h>
+#include <cstdint>
 
 namespace amuse
 {

include/amuse/SongState.hpp

@@ -1,7 +1,7 @@
 #ifndef __AMUSE_SONGSTATE_HPP__
 #define __AMUSE_SONGSTATE_HPP__
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <array>
 #include <list>

include/amuse/SoundMacroState.hpp

@@ -1,7 +1,7 @@
 #ifndef __AMUSE_SOUNDMACROSTATE_HPP__
 #define __AMUSE_SOUNDMACROSTATE_HPP__
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <list>
 #include "Entity.hpp"

include/amuse/Voice.hpp

@@ -1,8 +1,8 @@
 #ifndef __AMUSE_VOICE_HPP__
 #define __AMUSE_VOICE_HPP__
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 #include <memory>
 #include <list>
 #include "SoundMacroState.hpp"

lib/AudioGroupSampleDirectory.cpp

@@ -1,6 +1,6 @@
 #include "amuse/AudioGroupSampleDirectory.hpp"
 #include "amuse/Common.hpp"
-#include <string.h>
+#include <cstring>
 
 namespace amuse
 {

lib/ContainerRegistry.cpp

@@ -1,8 +1,8 @@
 #include "amuse/ContainerRegistry.hpp"
 #include "amuse/Common.hpp"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <memory>
 #include <unordered_map>

lib/DirectoryEnumerator.cpp

@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include <windows.h>
-#include <stdio.h>
+#include <cstdio>
 #else
 #include <dirent.h>
 #endif

lib/EffectChorus.cpp

@@ -1,7 +1,7 @@
 #include "amuse/EffectChorus.hpp"
 #include "amuse/Common.hpp"
 #include "amuse/IBackendVoice.hpp"
-#include <string.h>
+#include <cstring>
 #include <cmath>
 
 namespace amuse

lib/EffectDelay.cpp

@@ -1,7 +1,7 @@
 #include "amuse/EffectDelay.hpp"
 #include "amuse/Common.hpp"
 #include "amuse/IBackendVoice.hpp"
-#include <string.h>
+#include <cstring>
 #include <cmath>
 
 namespace amuse

lib/EffectReverb.cpp

@@ -1,7 +1,7 @@
 #include "amuse/EffectReverb.hpp"
 #include "amuse/IBackendVoice.hpp"
 #include <cmath>
-#include <string.h>
+#include <cstring>
 
 namespace amuse
 {

lib/SongConverter.cpp

@@ -1,7 +1,7 @@
 #include "amuse/SongConverter.hpp"
 #include "amuse/SongState.hpp"
 #include "amuse/Common.hpp"
-#include <stdlib.h>
+#include <cstdlib>
 #include <map>
 
 namespace amuse

lib/SoundMacroState.cpp

@@ -4,7 +4,7 @@
 #include "amuse/Common.hpp"
 #include "amuse/AudioGroup.hpp"
 #include "amuse/AudioGroupPool.hpp"
-#include <string.h>
+#include <cstring>
 
 /* Squelch Win32 macro pollution >.< */
 #undef SendMessage

lib/Voice.cpp

@@ -8,7 +8,7 @@
 #include "amuse/DSPCodec.h"
 #include "amuse/N64MusyXCodec.h"
 #include <cmath>
-#include <string.h>
+#include <cstring>
 
 namespace amuse
 {