Fix make_docs.bat

Delete trailing spaces in .h files

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..ac4f212
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/tools/doxygen.log
+/doc

diff --git a/cds/container/details/make_skip_list_map.h b/cds/container/details/make_skip_list_map.h
index a8b5dbde95ba5883d103835461f9b025e53576a5..af1076fa0833b3c2dad9f3c11c24fa9eb382538c 100644 (file)
--- a/cds/container/details/make_skip_list_map.h
+++ b/cds/container/details/make_skip_list_map.h
@@ -79,7 +79,7 @@ namespace cds { namespace container { namespace details {
                 return new( pMem )
                     node_type( nHeight,
                         nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize ) : nullptr,
-                        key, val 
+                        key, val
                     );
             }
 #       ifdef CDS_EMPLACE_SUPPORT
@@ -88,9 +88,9 @@ namespace cds { namespace container { namespace details {
             {
                 unsigned char * pMem = base_class::alloc_space( nHeight );
                 return new( pMem )
-                    node_type( nHeight, 
+                    node_type( nHeight,
                         nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize ) : nullptr,
-                        std::forward<Args>(args)... 
+                        std::forward<Args>(args)...
                     );
             }
 #       endif

diff --git a/cds/container/mspriority_queue.h b/cds/container/mspriority_queue.h
index 6620f5348342a1154b0ca8a9c2c07b842d88b0bd..2f83b5a3a6950750efde6c772bac29ffb7e1ca58 100644 (file)
--- a/cds/container/mspriority_queue.h
+++ b/cds/container/mspriority_queue.h
@@ -28,7 +28,7 @@ namespace cds { namespace container {
         /// Type traits for MSPriorityQueue
         /**
             The type traits for cds::container::MSPriorityQueue is the same as for
-            cds::intrusive::MSPriorityQueue (see cds::intrusive::mspriority_queue::type_traits) 
+            cds::intrusive::MSPriorityQueue (see cds::intrusive::mspriority_queue::type_traits)
             plus some additional properties.
         */
         struct type_traits: public cds::intrusive::mspriority_queue::type_traits
@@ -223,7 +223,7 @@ namespace cds { namespace container {
             The item is deleted from the heap.
 
             The function uses \ref move_policy to move extracted value from the heap's top
-            to \p dest. 
+            to \p dest.
 
             The function is equivalent of such call:
             \code

diff --git a/cds/intrusive/mspriority_queue.h b/cds/intrusive/mspriority_queue.h
index f287f7bc939231d5b9e65b9af76d6c136d3cbafc..ce277758c739a303949af6e8cd1c9cb74db19790 100644 (file)
--- a/cds/intrusive/mspriority_queue.h
+++ b/cds/intrusive/mspriority_queue.h
@@ -60,8 +60,8 @@ namespace cds { namespace intrusive {
             /**
                 The storage type for the heap array. Default is cds::opt::v::dynamic_buffer.
 
-                You may specify any type of buffer's value since at instantiation time 
-                the \p buffer::rebind member metafunction is called to change type 
+                You may specify any type of buffer's value since at instantiation time
+                the \p buffer::rebind member metafunction is called to change type
                 of values stored in the buffer.
             */
             typedef opt::v::dynamic_buffer<void *>  buffer;

diff --git a/cds/opt/make_options_std.h b/cds/opt/make_options_std.h
index 77260d312f404d190e9935cbd30ac81c5963fc30..a85d9af2870d835427a4ce4891921cf391c3ab1a 100644 (file)
--- a/cds/opt/make_options_std.h
+++ b/cds/opt/make_options_std.h
@@ -189,7 +189,7 @@ namespace cds { namespace opt {
             >::type
         type;
         */
-        struct type: public 
+        struct type: public
             do_pack<
                 typename do_pack<
                     typename do_pack<

diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index c5d2cd7e59ff661bdf230e2bfb6778b5c6c4f959..bf537fe481adfbe995816061c6ee9c0a394d5c7d 100644 (file)
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -4391,8 +4391,8 @@ namespace map2 {
                 ,cc::skip_list::random_level_generator< cc::skip_list::turbo_pascal >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_pascal > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_pascal >
         > SkipListMap_nogc_less_pascal;
 
         class traits_SkipListMap_nogc_less_pascal_seqcst: public cc::skip_list::make_traits <
@@ -4402,8 +4402,8 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_pascal_seqcst > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_pascal_seqcst >
         > SkipListMap_nogc_less_pascal_seqcst;
 
         class traits_SkipListMap_nogc_less_pascal_stat: public cc::skip_list::make_traits <
@@ -4413,8 +4413,8 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_pascal_stat > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_pascal_stat >
         > SkipListMap_nogc_less_pascal_stat;
 
         class traits_SkipListMap_nogc_cmp_pascal: public cc::skip_list::make_traits <
@@ -4424,7 +4424,7 @@ namespace map2 {
             >::type
         {};
         typedef NogcMapWrapper_dctor<
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_pascal > 
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_pascal >
         > SkipListMap_nogc_cmp_pascal;
 
         class traits_SkipListMap_nogc_cmp_pascal_stat: public cc::skip_list::make_traits <
@@ -4434,8 +4434,8 @@ namespace map2 {
                 ,co::stat< cc::skip_list::stat<> >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_pascal_stat > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_pascal_stat >
         > SkipListMap_nogc_cmp_pascal_stat;
 
         class traits_SkipListMap_nogc_less_xorshift: public cc::skip_list::make_traits <
@@ -4444,8 +4444,8 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_xorshift > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_xorshift >
         > SkipListMap_nogc_less_xorshift;
 
         class traits_SkipListMap_nogc_less_xorshift_stat: public cc::skip_list::make_traits <
@@ -4455,8 +4455,8 @@ namespace map2 {
                 ,co::item_counter< cds::atomicity::item_counter >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_xorshift_stat > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_less_xorshift_stat >
         > SkipListMap_nogc_less_xorshift_stat;
 
         class traits_SkipListMap_nogc_cmp_xorshift: public cc::skip_list::make_traits <
@@ -4465,8 +4465,8 @@ namespace map2 {
                 ,cc::skip_list::random_level_generator< cc::skip_list::xorshift >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< cc::SkipListMap< 
-            cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_xorshift > 
+        typedef NogcMapWrapper_dctor< cc::SkipListMap<
+            cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_xorshift >
         > SkipListMap_nogc_cmp_xorshift;
 
         class traits_SkipListMap_nogc_cmp_xorshift_stat: public cc::skip_list::make_traits <
@@ -4476,8 +4476,8 @@ namespace map2 {
                 ,co::stat< cc::skip_list::stat<> >
             >::type
         {};
-        typedef NogcMapWrapper_dctor< 
-            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_xorshift_stat > 
+        typedef NogcMapWrapper_dctor<
+            cc::SkipListMap< cds::gc::nogc, Key, Value, traits_SkipListMap_nogc_cmp_xorshift_stat >
         > SkipListMap_nogc_cmp_xorshift_stat;
 
         // ***************************************************************************

diff --git a/tools/make_docs.bat b/tools/make_docs.bat
index 48bac73e47ae0a915a11844e7232e20da585f2e3..16c6796ee02bfd69e2e4d9bfd383aa2c809fd75c 100644 (file)
--- a/tools/make_docs.bat
+++ b/tools/make_docs.bat
@@ -1,5 +1,7 @@
+set DOXYPRJ_ROOT=.\r
+cd ..\r
 rm -fr doc\r
 md doc\r
-set DOXYPRJ_ROOT=.\r
-%DOXYGEN_PATH%\bin\doxygen ..\doxygen\cds.doxy > ..\doxygen\doxygen.log 2>&1\r
-cp -f ../doxygen/index.html ../doc/index.html\r
+%DOXYGEN_PATH%\bin\doxygen doxygen\cds.doxy > tools\doxygen.log 2>&1\r
+cp -f doxygen/index.html doc/index.html\r
+cd tools\r