[Bf-blender-cvs] [71ec8895b75] functions: rename tuple folder to cpp
Jacques Lucke
noreply at git.blender.org
Tue Aug 6 12:11:47 CEST 2019
Commit: 71ec8895b7558636a8ade901f895c2bc1c488d7e
Author: Jacques Lucke
Date: Tue Aug 6 11:59:36 2019 +0200
Branches: functions
https://developer.blender.org/rB71ec8895b7558636a8ade901f895c2bc1c488d7e
rename tuple folder to cpp
===================================================================
M source/blender/functions/CMakeLists.txt
R075 source/blender/functions/FN_tuple-c.h source/blender/functions/FN_cpp-c.h
A source/blender/functions/FN_cpp.hpp
D source/blender/functions/FN_tuple.hpp
R095 source/blender/functions/backends/tuple/tuple-c.cpp source/blender/functions/backends/cpp/cpp-c.cpp
R100 source/blender/functions/backends/tuple/tuple-c.h source/blender/functions/backends/cpp/cpp-c.h
R100 source/blender/functions/backends/tuple/cpp_type_info.cpp source/blender/functions/backends/cpp/cpp_type_info.cpp
R100 source/blender/functions/backends/tuple/cpp_type_info.hpp source/blender/functions/backends/cpp/cpp_type_info.hpp
R100 source/blender/functions/backends/tuple/list.cpp source/blender/functions/backends/cpp/list.cpp
R100 source/blender/functions/backends/tuple/list.hpp source/blender/functions/backends/cpp/list.hpp
R100 source/blender/functions/backends/tuple/tuple.cpp source/blender/functions/backends/cpp/tuple.cpp
R100 source/blender/functions/backends/tuple/tuple.hpp source/blender/functions/backends/cpp/tuple.hpp
M source/blender/functions/backends/tuple_call/tuple_call-c.h
M source/blender/functions/backends/tuple_call/tuple_call.hpp
M source/blender/functions/types/boolean.cpp
M source/blender/functions/types/external.cpp
M source/blender/functions/types/lists.cpp
M source/blender/functions/types/lists.hpp
M source/blender/functions/types/numeric.cpp
M source/blender/functions/types/tuple_access-c.h
===================================================================
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index f2898142223..842a0388716 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -54,14 +54,14 @@ set(SRC
core/core-c.h
core/core-c.cpp
- backends/tuple/cpp_type_info.hpp
- backends/tuple/cpp_type_info.cpp
- backends/tuple/tuple.hpp
- backends/tuple/tuple.cpp
- backends/tuple/list.hpp
- backends/tuple/list.cpp
- backends/tuple/tuple-c.h
- backends/tuple/tuple-c.cpp
+ backends/cpp/cpp_type_info.hpp
+ backends/cpp/cpp_type_info.cpp
+ backends/cpp/tuple.hpp
+ backends/cpp/tuple.cpp
+ backends/cpp/list.hpp
+ backends/cpp/list.cpp
+ backends/cpp/cpp-c.h
+ backends/cpp/cpp-c.cpp
backends/tuple_call/tuple_call.hpp
backends/tuple_call/tuple_call.cpp
diff --git a/source/blender/functions/FN_tuple-c.h b/source/blender/functions/FN_cpp-c.h
similarity index 75%
rename from source/blender/functions/FN_tuple-c.h
rename to source/blender/functions/FN_cpp-c.h
index a8b92013e6c..492e32e71e5 100644
--- a/source/blender/functions/FN_tuple-c.h
+++ b/source/blender/functions/FN_cpp-c.h
@@ -1,6 +1,6 @@
#ifndef __FUNCTIONS_TUPLE_C_H__
#define __FUNCTIONS_TUPLE_C_H__
-#include "backends/tuple/tuple-c.h"
+#include "backends/cpp/cpp-c.h"
#endif /* __FUNCTIONS_TUPLE_CALL_C_H__ */
diff --git a/source/blender/functions/FN_cpp.hpp b/source/blender/functions/FN_cpp.hpp
new file mode 100644
index 00000000000..8f5ed065725
--- /dev/null
+++ b/source/blender/functions/FN_cpp.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "FN_cpp-c.h"
+#include "backends/cpp/cpp_type_info.hpp"
+#include "backends/cpp/tuple.hpp"
+#include "backends/cpp/list.hpp"
diff --git a/source/blender/functions/FN_tuple.hpp b/source/blender/functions/FN_tuple.hpp
deleted file mode 100644
index 63426b10985..00000000000
--- a/source/blender/functions/FN_tuple.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "FN_tuple-c.h"
-#include "backends/tuple/cpp_type_info.hpp"
-#include "backends/tuple/tuple.hpp"
-#include "backends/tuple/list.hpp"
diff --git a/source/blender/functions/backends/tuple/tuple-c.cpp b/source/blender/functions/backends/cpp/cpp-c.cpp
similarity index 95%
rename from source/blender/functions/backends/tuple/tuple-c.cpp
rename to source/blender/functions/backends/cpp/cpp-c.cpp
index fad6ec659cd..dfe461c771f 100644
--- a/source/blender/functions/backends/tuple/tuple-c.cpp
+++ b/source/blender/functions/backends/cpp/cpp-c.cpp
@@ -1,4 +1,4 @@
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
using namespace FN;
diff --git a/source/blender/functions/backends/tuple/tuple-c.h b/source/blender/functions/backends/cpp/cpp-c.h
similarity index 100%
rename from source/blender/functions/backends/tuple/tuple-c.h
rename to source/blender/functions/backends/cpp/cpp-c.h
diff --git a/source/blender/functions/backends/tuple/cpp_type_info.cpp b/source/blender/functions/backends/cpp/cpp_type_info.cpp
similarity index 100%
rename from source/blender/functions/backends/tuple/cpp_type_info.cpp
rename to source/blender/functions/backends/cpp/cpp_type_info.cpp
diff --git a/source/blender/functions/backends/tuple/cpp_type_info.hpp b/source/blender/functions/backends/cpp/cpp_type_info.hpp
similarity index 100%
rename from source/blender/functions/backends/tuple/cpp_type_info.hpp
rename to source/blender/functions/backends/cpp/cpp_type_info.hpp
diff --git a/source/blender/functions/backends/tuple/list.cpp b/source/blender/functions/backends/cpp/list.cpp
similarity index 100%
rename from source/blender/functions/backends/tuple/list.cpp
rename to source/blender/functions/backends/cpp/list.cpp
diff --git a/source/blender/functions/backends/tuple/list.hpp b/source/blender/functions/backends/cpp/list.hpp
similarity index 100%
rename from source/blender/functions/backends/tuple/list.hpp
rename to source/blender/functions/backends/cpp/list.hpp
diff --git a/source/blender/functions/backends/tuple/tuple.cpp b/source/blender/functions/backends/cpp/tuple.cpp
similarity index 100%
rename from source/blender/functions/backends/tuple/tuple.cpp
rename to source/blender/functions/backends/cpp/tuple.cpp
diff --git a/source/blender/functions/backends/tuple/tuple.hpp b/source/blender/functions/backends/cpp/tuple.hpp
similarity index 100%
rename from source/blender/functions/backends/tuple/tuple.hpp
rename to source/blender/functions/backends/cpp/tuple.hpp
diff --git a/source/blender/functions/backends/tuple_call/tuple_call-c.h b/source/blender/functions/backends/tuple_call/tuple_call-c.h
index 5d58d30c4a9..ec0754ce114 100644
--- a/source/blender/functions/backends/tuple_call/tuple_call-c.h
+++ b/source/blender/functions/backends/tuple_call/tuple_call-c.h
@@ -2,7 +2,7 @@
#define __FUNCTIONS_TUPLE_CALL_WRAPPER_C_H__
#include "FN_core-c.h"
-#include "FN_tuple-c.h"
+#include "FN_cpp-c.h"
#include "BLI_alloca.h"
#ifdef __cplusplus
diff --git a/source/blender/functions/backends/tuple_call/tuple_call.hpp b/source/blender/functions/backends/tuple_call/tuple_call.hpp
index 2149161148a..e47677a6378 100644
--- a/source/blender/functions/backends/tuple_call/tuple_call.hpp
+++ b/source/blender/functions/backends/tuple_call/tuple_call.hpp
@@ -6,7 +6,7 @@
* and outputs a tuple containing the computed values.
*/
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
#include "execution_context.hpp"
namespace FN {
diff --git a/source/blender/functions/types/boolean.cpp b/source/blender/functions/types/boolean.cpp
index 528047df37e..d8a3daec1dc 100644
--- a/source/blender/functions/types/boolean.cpp
+++ b/source/blender/functions/types/boolean.cpp
@@ -2,7 +2,7 @@
#include "BLI_lazy_init.hpp"
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
#include "FN_llvm.hpp"
namespace FN {
diff --git a/source/blender/functions/types/external.cpp b/source/blender/functions/types/external.cpp
index 7531af0256d..23c9cecd87d 100644
--- a/source/blender/functions/types/external.cpp
+++ b/source/blender/functions/types/external.cpp
@@ -1,7 +1,7 @@
#include "external.hpp"
#include "BLI_lazy_init.hpp"
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
#include "FN_llvm.hpp"
#include "DNA_object_types.h"
diff --git a/source/blender/functions/types/lists.cpp b/source/blender/functions/types/lists.cpp
index 2885adc774f..c7401f158f0 100644
--- a/source/blender/functions/types/lists.cpp
+++ b/source/blender/functions/types/lists.cpp
@@ -1,6 +1,6 @@
#include "BLI_lazy_init.hpp"
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
#include "FN_llvm.hpp"
#include "FN_types.hpp"
diff --git a/source/blender/functions/types/lists.hpp b/source/blender/functions/types/lists.hpp
index b1eee43a60d..0174d1e60a0 100644
--- a/source/blender/functions/types/lists.hpp
+++ b/source/blender/functions/types/lists.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
namespace FN {
namespace Types {
diff --git a/source/blender/functions/types/numeric.cpp b/source/blender/functions/types/numeric.cpp
index 93d66201853..9bb7566eb8a 100644
--- a/source/blender/functions/types/numeric.cpp
+++ b/source/blender/functions/types/numeric.cpp
@@ -1,7 +1,7 @@
#include "numeric.hpp"
#include "BLI_lazy_init.hpp"
-#include "FN_tuple.hpp"
+#include "FN_cpp.hpp"
#include "FN_llvm.hpp"
namespace FN {
diff --git a/source/blender/functions/types/tuple_access-c.h b/source/blender/functions/types/tuple_access-c.h
index c945cb8f307..85e84fd975c 100644
--- a/source/blender/functions/types/tuple_access-c.h
+++ b/source/blender/functions/types/tuple_access-c.h
@@ -1,7 +1,7 @@
#ifndef __FUNCTIONS_TYPES_TUPLE_ACCESS_C_H__
#define __FUNCTIONS_TYPES_TUPLE_ACCESS_C_H__
-#include "FN_tuple-c.h"
+#include "FN_cpp-c.h"
#include "types-c.h"
#include "BLI_utildefines.h"
More information about the Bf-blender-cvs
mailing list