From 4fb5bbc0d286d417f88138ac03c72e3f2fb5c082 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Fri, 5 Oct 2012 09:11:45 +0000
Subject: [PATCH] [debugallocator] rename files... remove underscores
[[Imported from SVN: r7012]]
---
dune/common/Makefile.am | 4 +-
.../{debug_allocator.cc => debugallocator.cc} | 2 +-
.../{debug_allocator.hh => debugallocator.hh} | 0
dune/common/test/Makefile.am | 46 +++++++++----------
...t-debug-alloc.cc => testdebugallocator.cc} | 2 +-
5 files changed, 27 insertions(+), 27 deletions(-)
rename dune/common/{debug_allocator.cc => debugallocator.cc} (95%)
rename dune/common/{debug_allocator.hh => debugallocator.hh} (100%)
rename dune/common/test/{test-debug-alloc.cc => testdebugallocator.cc} (97%)
diff --git a/dune/common/Makefile.am b/dune/common/Makefile.am
index 3688decd4..86be7cc7f 100644
--- a/dune/common/Makefile.am
+++ b/dune/common/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = . test parallel
noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
- debug_allocator.cc \
+ debugallocator.cc \
fmatrixev.cc \
ios_state.cc \
parametertree.cc \
@@ -27,7 +27,7 @@ commoninclude_HEADERS = \
bitsetvector.hh \
classname.hh \
collectivecommunication.hh \
- debug_allocator.hh \
+ debugallocator.hh \
debugstream.hh \
deprecated.hh \
densematrix.hh \
diff --git a/dune/common/debug_allocator.cc b/dune/common/debugallocator.cc
similarity index 95%
rename from dune/common/debug_allocator.cc
rename to dune/common/debugallocator.cc
index fbe0d2e6d..c072904b7 100644
--- a/dune/common/debug_allocator.cc
+++ b/dune/common/debugallocator.cc
@@ -4,7 +4,7 @@
#include "config.h"
#endif
-#include "debug_allocator.hh"
+#include "debugallocator.hh"
#include <iostream>
#include <unistd.h>
diff --git a/dune/common/debug_allocator.hh b/dune/common/debugallocator.hh
similarity index 100%
rename from dune/common/debug_allocator.hh
rename to dune/common/debugallocator.hh
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 3aeb3bc62..faa4c09bd 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -32,12 +32,12 @@ TESTPROGS = \
singletontest \
static_assert_test \
streamtest \
- test_debug_alloc \
- test_debug_alloc_fail1 \
- test_debug_alloc_fail2 \
- test_debug_alloc_fail3 \
- test_debug_alloc_fail4 \
- test_debug_alloc_fail5 \
+ testdebugallocator \
+ testdebugallocator_fail1 \
+ testdebugallocator_fail2 \
+ testdebugallocator_fail3 \
+ testdebugallocator_fail4 \
+ testdebugallocator_fail5 \
testfassign1 \
testfassign2 \
testfassign3 \
@@ -82,11 +82,11 @@ EXTRA_PROGRAMS = $(COMPILE_XFAIL_TESTS) sllisttest
TESTS = $(TESTPROGS) $(COMPILE_XFAIL)
XFAIL_TESTS = \
- test_debug_alloc_fail1 \
- test_debug_alloc_fail2 \
- test_debug_alloc_fail3 \
- test_debug_alloc_fail4 \
- test_debug_alloc_fail5 \
+ testdebugallocator_fail1 \
+ testdebugallocator_fail2 \
+ testdebugallocator_fail3 \
+ testdebugallocator_fail4 \
+ testdebugallocator_fail5 \
testfassign_fail1 \
testfassign_fail2 \
testfassign_fail3 \
@@ -204,23 +204,23 @@ singletontest_SOURCES = singletontest.cc
utilitytest_SOURCES = utilitytest.cc
-test_debug_alloc_SOURCES = test-debug-alloc.cc
-test_debug_alloc_CPPFLAGS = $(AM_CPPFLAGS)
+testdebugallocator_SOURCES = testdebugallocator.cc
+testdebugallocator_CPPFLAGS = $(AM_CPPFLAGS)
-test_debug_alloc_fail1_SOURCES = test-debug-alloc.cc
-test_debug_alloc_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE1
+testdebugallocator_fail1_SOURCES = testdebugallocator.cc
+testdebugallocator_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE1
-test_debug_alloc_fail2_SOURCES = test-debug-alloc.cc
-test_debug_alloc_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE2
+testdebugallocator_fail2_SOURCES = testdebugallocator.cc
+testdebugallocator_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE2
-test_debug_alloc_fail3_SOURCES = test-debug-alloc.cc
-test_debug_alloc_fail3_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE3
+testdebugallocator_fail3_SOURCES = testdebugallocator.cc
+testdebugallocator_fail3_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE3
-test_debug_alloc_fail4_SOURCES = test-debug-alloc.cc
-test_debug_alloc_fail4_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE4
+testdebugallocator_fail4_SOURCES = testdebugallocator.cc
+testdebugallocator_fail4_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE4
-test_debug_alloc_fail5_SOURCES = test-debug-alloc.cc
-test_debug_alloc_fail5_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE5
+testdebugallocator_fail5_SOURCES = testdebugallocator.cc
+testdebugallocator_fail5_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE5
testfassign1_SOURCES = testfassign.cc testfassign2.cc
testfassign1_CPPFLAGS = $(AM_CPPFLAGS) -D_DUNE_TEST_N=3 -D_VALUES="1,2,3"
diff --git a/dune/common/test/test-debug-alloc.cc b/dune/common/test/testdebugallocator.cc
similarity index 97%
rename from dune/common/test/test-debug-alloc.cc
rename to dune/common/test/testdebugallocator.cc
index eaedb855b..4bc14593b 100644
--- a/dune/common/test/test-debug-alloc.cc
+++ b/dune/common/test/testdebugallocator.cc
@@ -7,7 +7,7 @@
// #define DEBUG_ALLOCATOR_KEEP 1
#define DEBUG_NEW_DELETE 3
-#include <dune/common/debug_allocator.hh>
+#include <dune/common/debugallocator.hh>
#include <iostream>
#include <cstdlib>
--
GitLab