Use XMLNode::get/set_property in ARDOUR::ExportFilename class

[ardour.git] / libs / pbd / malign.cc

diff --git a/libs/pbd/malign.cc b/libs/pbd/malign.cc
index e9695cd91c0e6fc32671004b56e118d66714b2b8..59c6c4469ef3f5b61260e7c8e475948b7c392319 100644 (file)
--- a/libs/pbd/malign.cc
+++ b/libs/pbd/malign.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include "pbd/malign.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 
@@ -47,8 +47,6 @@ int cache_aligned_malloc (void** memptr, size_t size)
                return 0;
        }
 #else
-       std::string << string_compose (_("Memory allocation error: malloc (%1 * %2)"),
-                                        CPU_CACHE_ALIGN, size) << endmsg;
        if (((*memptr) = malloc (size)) == 0) {
                fatal << string_compose (_("Memory allocation error: malloc (%1 * %2) failed (%3)"),
                                         CPU_CACHE_ALIGN, size, strerror (errno)) << endmsg;
@@ -64,7 +62,7 @@ int cache_aligned_malloc (void** memptr, size_t size)
        }
 
        return 0;
-#endif 
+#endif
 }
 
 void cache_aligned_free (void* memptr)
@@ -103,7 +101,7 @@ int  aligned_malloc (void** memptr, size_t size, size_t alignment)
        }
 
        return 0;
-#endif 
+#endif
 }
 
 void aligned_free (void* memptr)
@@ -113,4 +111,4 @@ void aligned_free (void* memptr)
 #else
        free (memptr);
 #endif
-}
\ No newline at end of file
+}