Regenerated headers, using makefile

rethinkdb · Dec 28, 2017 · 723e63c · 723e63c
1 parent 7138150
commit 723e63c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/scripts/generate_join_macros.py b/scripts/generate_join_macros.py
@@ -5,9 +5,9 @@
 definitions.
 
 This script is meant to be run as follows (assuming you are in the
-"rethinkdb/src" directory):
+top directory):
 
-$ ../scripts/generate_join_macros.py > rpc/semilattice/joins/macros.hpp
+$ ./scripts/generate_join_macros.py > src/rpc/semilattice/joins/macros.hpp
 
 """
 

diff --git a/scripts/generate_serialize_macros.py b/scripts/generate_serialize_macros.py
@@ -8,9 +8,9 @@
 have a Python script to generate them.
 
 This script is meant to be run as follows (assuming you are in the
-"rethinkdb/src" directory):
+top directory):
 
-$ ../scripts/generate_serialize_macros.py > rpc/serialize_macros.hpp
+$ ./scripts/generate_serialize_macros.py > src/rpc/serialize_macros.hpp
 
 """
 

diff --git a/src/rpc/semilattice/joins/macros.hpp b/src/rpc/semilattice/joins/macros.hpp
@@ -2,8 +2,8 @@
 #ifndef RPC_SEMILATTICE_JOINS_MACROS_HPP_
 #define RPC_SEMILATTICE_JOINS_MACROS_HPP_
 
-/* This file is automatically generated by '../scripts/generate_join_macros.py'.
-Please modify '../scripts/generate_join_macros.py' instead of modifying this file.*/
+/* This file is automatically generated by 'scripts/generate_join_macros.py'.
+Please modify 'scripts/generate_join_macros.py' instead of modifying this file.*/
 
 /* The purpose of these macros is to make it easier to define semilattice joins
 for types that consist of a fixed set of fields which it is a simple product of.
@@ -14,7 +14,7 @@ of the type; the remaining parameters are the fields. You will also need an
 
 Example:
     struct point_t {
-        versioned_t<int> x, y;
+        vclock_t<int> x, y;
     };
     RDB_MAKE_SEMILATTICE_JOINABLE_2(point_t, x, y)
 

diff --git a/src/rpc/serialize_macros.hpp b/src/rpc/serialize_macros.hpp
@@ -2,8 +2,8 @@
 #ifndef RPC_SERIALIZE_MACROS_HPP_
 #define RPC_SERIALIZE_MACROS_HPP_
 
-/* This file is automatically generated by './scripts/generate_serialize_macros.py'.
-Please modify './scripts/generate_serialize_macros.py' instead of modifying this file.*/
+/* This file is automatically generated by 'scripts/generate_serialize_macros.py'.
+Please modify 'scripts/generate_serialize_macros.py' instead of modifying this file.*/
 
 #include <type_traits>