From e93fa4c32fe5f22794496b221a5d0fe28faa0e91 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Tue, 14 Oct 2014 22:38:25 +0400
Subject: [PATCH] rename test-hdr/queue/hdr_queue_new.h to hdr_queue.h

---
 projects/Win/vc12/hdr-test-queue.vcxproj              | 1 -
 projects/Win/vc12/hdr-test-queue.vcxproj.filters      | 3 ---
 tests/test-hdr/queue/hdr_basketqueue_dhp.cpp          | 2 +-
 tests/test-hdr/queue/hdr_basketqueue_hp.cpp           | 2 +-
 tests/test-hdr/queue/hdr_fcqueue.h                    | 6 +++---
 tests/test-hdr/queue/hdr_moirqueue_dhp.cpp            | 2 +-
 tests/test-hdr/queue/hdr_moirqueue_hp.cpp             | 2 +-
 tests/test-hdr/queue/hdr_msqueue_dhp.cpp              | 2 +-
 tests/test-hdr/queue/hdr_msqueue_hp.cpp               | 2 +-
 tests/test-hdr/queue/hdr_optimistic_dhp.cpp           | 2 +-
 tests/test-hdr/queue/hdr_optimistic_hp.cpp            | 2 +-
 tests/test-hdr/queue/{hdr_queue_new.h => hdr_queue.h} | 0
 tests/test-hdr/queue/hdr_queue_register.cpp           | 2 +-
 tests/test-hdr/queue/hdr_rwqueue.cpp                  | 2 +-
 tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp       | 2 +-
 tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp       | 2 +-
 16 files changed, 15 insertions(+), 19 deletions(-)
 rename tests/test-hdr/queue/{hdr_queue_new.h => hdr_queue.h} (100%)

diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj b/projects/Win/vc12/hdr-test-queue.vcxproj
index b5ace015..93f2ecc8 100644
--- a/projects/Win/vc12/hdr-test-queue.vcxproj
+++ b/projects/Win/vc12/hdr-test-queue.vcxproj
@@ -568,7 +568,6 @@
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_fcqueue.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_intrusive_msqueue.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_intrusive_segmented_queue.h" />
-    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h" />
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_segmented_queue.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/Win/vc12/hdr-test-queue.vcxproj.filters b/projects/Win/vc12/hdr-test-queue.vcxproj.filters
index 0f478f03..a4e85f3e 100644
--- a/projects/Win/vc12/hdr-test-queue.vcxproj.filters
+++ b/projects/Win/vc12/hdr-test-queue.vcxproj.filters
@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_segmented_queue.h">
       <Filter>container</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_queue_new.h">
-      <Filter>container</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\tests\test-hdr\queue\hdr_fcqueue.h">
       <Filter>container</Filter>
     </ClInclude>
diff --git a/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp b/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp
index 5303e7f2..c64ccc01 100644
--- a/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_basketqueue_dhp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/dhp.h>
 #include <cds/container/basket_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_basketqueue_hp.cpp b/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
index 5466c1ad..3d5f7ded 100644
--- a/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/basket_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_fcqueue.h b/tests/test-hdr/queue/hdr_fcqueue.h
index 25b6417e..411bf9da 100644
--- a/tests/test-hdr/queue/hdr_fcqueue.h
+++ b/tests/test-hdr/queue/hdr_fcqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_QUEUE_SIMPLE_H
-#define __UNIT_QUEUE_SIMPLE_H
+#ifndef __CDSUNIT_HDR_FCQUEUE_H
+#define __CDSUNIT_HDR_FCQUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include <cds/details/defs.h>
@@ -162,4 +162,4 @@ namespace queue {
     };
 } // namespace queue
 
-#endif // #ifndef __UNIT_QUEUE_SIMPLE_H
+#endif // #ifndef __CDSUNIT_HDR_FCQUEUE_H
diff --git a/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp b/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp
index 5c805c0b..fec72a12 100644
--- a/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_moirqueue_dhp.cpp
@@ -2,7 +2,7 @@
 
 #include <cds/gc/dhp.h>
 #include <cds/container/moir_queue.h>
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_moirqueue_hp.cpp b/tests/test-hdr/queue/hdr_moirqueue_hp.cpp
index 86f5083a..c97b31c3 100644
--- a/tests/test-hdr/queue/hdr_moirqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_moirqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/moir_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_msqueue_dhp.cpp b/tests/test-hdr/queue/hdr_msqueue_dhp.cpp
index 82671315..e0a91df3 100644
--- a/tests/test-hdr/queue/hdr_msqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_msqueue_dhp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/dhp.h>
 #include <cds/container/msqueue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_msqueue_hp.cpp b/tests/test-hdr/queue/hdr_msqueue_hp.cpp
index 0fd442b4..0a9dda4d 100644
--- a/tests/test-hdr/queue/hdr_msqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_msqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/msqueue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_optimistic_dhp.cpp b/tests/test-hdr/queue/hdr_optimistic_dhp.cpp
index aa6ce381..a9d7fb0a 100644
--- a/tests/test-hdr/queue/hdr_optimistic_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_optimistic_dhp.cpp
@@ -3,7 +3,7 @@
 #include <cds/container/optimistic_queue.h>
 #include <cds/gc/dhp.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_optimistic_hp.cpp b/tests/test-hdr/queue/hdr_optimistic_hp.cpp
index b73d0d30..2b16c6aa 100644
--- a/tests/test-hdr/queue/hdr_optimistic_hp.cpp
+++ b/tests/test-hdr/queue/hdr_optimistic_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/container/optimistic_queue.h>
 #include <cds/gc/hp.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
diff --git a/tests/test-hdr/queue/hdr_queue_new.h b/tests/test-hdr/queue/hdr_queue.h
similarity index 100%
rename from tests/test-hdr/queue/hdr_queue_new.h
rename to tests/test-hdr/queue/hdr_queue.h
diff --git a/tests/test-hdr/queue/hdr_queue_register.cpp b/tests/test-hdr/queue/hdr_queue_register.cpp
index 334d6be4..9ef1d406 100644
--- a/tests/test-hdr/queue/hdr_queue_register.cpp
+++ b/tests/test-hdr/queue/hdr_queue_register.cpp
@@ -2,7 +2,7 @@
 
 #include "hdr_intrusive_msqueue.h"
 #include "hdr_intrusive_segmented_queue.h"
-#include "hdr_queue_new.h"
+#include "hdr_queue.h"
 #include "hdr_fcqueue.h"
 #include "hdr_segmented_queue.h"
 
diff --git a/tests/test-hdr/queue/hdr_rwqueue.cpp b/tests/test-hdr/queue/hdr_rwqueue.cpp
index bb826a08..ea72eab5 100644
--- a/tests/test-hdr/queue/hdr_rwqueue.cpp
+++ b/tests/test-hdr/queue/hdr_rwqueue.cpp
@@ -3,7 +3,7 @@
 #include <cds/container/rwqueue.h>
 #include <mutex>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
     void HdrTestQueue::RWQueue_default()
diff --git a/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp b/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp
index 2b0b38be..ce9bfaba 100644
--- a/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp
+++ b/tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp
@@ -1,6 +1,6 @@
 //$$CDS-header$$
 
-#include "hdr_queue_new.h"
+#include "hdr_queue.h"
 #include <cds/container/tsigas_cycle_queue.h>
 
 namespace queue {
diff --git a/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp b/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
index 606ef43e..ef267dec 100644
--- a/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
+++ b/tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
@@ -2,7 +2,7 @@
 
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
     namespace{
-- 
2.34.1