renamed mtapi_cpp_ext to mtapi_cpp

CMakeLists.txt

@@ -126,7 +126,7 @@ add_subdirectory(base_c)
 add_subdirectory(base_cpp)
 add_subdirectory(base_cpp)
 add_subdirectory(mtapi_c)
 add_subdirectory(mtapi_c)
 add_subdirectory(tasks_cpp)
 add_subdirectory(tasks_cpp)
-add_subdirectory(mtapi_cpp_ext)
+add_subdirectory(mtapi_cpp)
 add_subdirectory(containers_cpp)
 add_subdirectory(containers_cpp)
 add_subdirectory(algorithms_cpp)
 add_subdirectory(algorithms_cpp)
 add_subdirectory(dataflow_cpp)
 add_subdirectory(dataflow_cpp)

mtapi_cpp_ext/CMakeLists.txt → mtapi_cpp/CMakeLists.txt

-project (project_mtapi_cpp_ext)
+project (project_mtapi_cpp)
 
 
-file(GLOB_RECURSE EMBB_MTAPI_CPP_EXT_SOURCES "src/*.cc" "src/*.h")
-file(GLOB_RECURSE EMBB_MTAPI_CPP_EXT_HEADERS "include/*.h")
-file(GLOB_RECURSE EMBB_MTAPI_CPP_EXT_TEST_SOURCES "test/*.cc" "test/*.h")
+file(GLOB_RECURSE EMBB_MTAPI_CPP_SOURCES "src/*.cc" "src/*.h")
+file(GLOB_RECURSE EMBB_MTAPI_CPP_HEADERS "include/*.h")
+file(GLOB_RECURSE EMBB_MTAPI_CPP_TEST_SOURCES "test/*.cc" "test/*.h")
 
 
 if (USE_AUTOMATIC_INITIALIZATION STREQUAL ON)
 if (USE_AUTOMATIC_INITIALIZATION STREQUAL ON)
   message("-- Automatic initialization enabled (default)")
   message("-- Automatic initialization enabled (default)")
@@ -20,25 +20,25 @@ GroupSourcesMSVC(include)
 GroupSourcesMSVC(src)
 GroupSourcesMSVC(src)
 GroupSourcesMSVC(test)
 GroupSourcesMSVC(test)
 
 
-set (EMBB_MTAPI_CPP_EXT_INCLUDE_DIRS "include" "src" "test")
-include_directories(${EMBB_MTAPI_CPP_EXT_INCLUDE_DIRS}
+set (EMBB_MTAPI_CPP_INCLUDE_DIRS "include" "src" "test")
+include_directories(${EMBB_MTAPI_CPP_INCLUDE_DIRS}
                     ${CMAKE_CURRENT_SOURCE_DIR}/../base_c/include
                     ${CMAKE_CURRENT_SOURCE_DIR}/../base_c/include
                     ${CMAKE_CURRENT_BINARY_DIR}/../base_c/include
                     ${CMAKE_CURRENT_BINARY_DIR}/../base_c/include
                     ${CMAKE_CURRENT_SOURCE_DIR}/../base_cpp/include
                     ${CMAKE_CURRENT_SOURCE_DIR}/../base_cpp/include
                     ${CMAKE_CURRENT_BINARY_DIR}/../base_cpp/include
                     ${CMAKE_CURRENT_BINARY_DIR}/../base_cpp/include
                     ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/include)
                     ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/include)
 
 
-add_library (embb_mtapi_cpp_ext ${EMBB_MTAPI_CPP_EXT_SOURCES} ${EMBB_MTAPI_CPP_EXT_HEADERS})
-target_link_libraries(embb_mtapi_cpp_ext embb_mtapi_c)
+add_library (embb_mtapi_cpp ${EMBB_MTAPI_CPP_SOURCES} ${EMBB_MTAPI_CPP_HEADERS})
+target_link_libraries(embb_mtapi_cpp embb_mtapi_c)
 
 
 if (BUILD_TESTS STREQUAL ON)
 if (BUILD_TESTS STREQUAL ON)
   include_directories(${CMAKE_CURRENT_BINARY_DIR}/../partest/include)
   include_directories(${CMAKE_CURRENT_BINARY_DIR}/../partest/include)
-  add_executable (embb_mtapi_cpp_ext_test ${EMBB_MTAPI_CPP_EXT_TEST_SOURCES})
-  target_link_libraries(embb_mtapi_cpp_ext_test embb_mtapi_cpp_ext embb_mtapi_c partest 
+  add_executable (embb_mtapi_cpp_test ${EMBB_MTAPI_CPP_TEST_SOURCES})
+  target_link_libraries(embb_mtapi_cpp_test embb_mtapi_cpp embb_mtapi_c partest 
                         embb_base_cpp embb_base_c ${compiler_libs})
                         embb_base_cpp embb_base_c ${compiler_libs})
-  CopyBin(BIN embb_mtapi_cpp_ext_test DEST ${local_install_dir})
+  CopyBin(BIN embb_mtapi_cpp_test DEST ${local_install_dir})
 endif()
 endif()
 
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
         DESTINATION include FILES_MATCHING PATTERN "*.h")
         DESTINATION include FILES_MATCHING PATTERN "*.h")
-install(TARGETS embb_mtapi_cpp_ext DESTINATION lib)
+install(TARGETS embb_mtapi_cpp DESTINATION lib)

mtapi_cpp_ext/include/embb/mtapi_ext/action.h → mtapi_cpp/include/embb/mtapi/action.h

@@ -27,9 +27,9 @@
 #ifndef EMBB_MTAPI_ACTION_H_
 #ifndef EMBB_MTAPI_ACTION_H_
 #define EMBB_MTAPI_ACTION_H_
 #define EMBB_MTAPI_ACTION_H_
 
 
-#include <embb/mtapi_ext/internal/check_status.h>
-#include <embb/mtapi_ext/action_attributes.h>
-#include <embb/mtapi_ext/job.h>
+#include <embb/mtapi/internal/check_status.h>
+#include <embb/mtapi/action_attributes.h>
+#include <embb/mtapi/job.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/action_attributes.h → mtapi_cpp/include/embb/mtapi/action_attributes.h

@@ -28,8 +28,8 @@
 #define EMBB_MTAPI_ACTION_ATTRIBUTES_H_
 #define EMBB_MTAPI_ACTION_ATTRIBUTES_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
-#include <embb/mtapi_ext/affinity.h>
+#include <embb/mtapi/internal/check_status.h>
+#include <embb/mtapi/affinity.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/affinity.h → mtapi_cpp/include/embb/mtapi/affinity.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_AFFINITY_H_
 #define EMBB_MTAPI_AFFINITY_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/group.h → mtapi_cpp/include/embb/mtapi/group.h

@@ -28,10 +28,10 @@
 #define EMBB_MTAPI_GROUP_H_
 #define EMBB_MTAPI_GROUP_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/job.h>
-#include <embb/mtapi_ext/task.h>
-#include <embb/mtapi_ext/task_attributes.h>
-#include <embb/mtapi_ext/group_attributes.h>
+#include <embb/mtapi/job.h>
+#include <embb/mtapi/task.h>
+#include <embb/mtapi/task_attributes.h>
+#include <embb/mtapi/group_attributes.h>
 
 
 namespace embb {
 namespace embb {
 
 

mtapi_cpp_ext/include/embb/mtapi_ext/group_attributes.h → mtapi_cpp/include/embb/mtapi/group_attributes.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_GROUP_ATTRIBUTES_H_
 #define EMBB_MTAPI_GROUP_ATTRIBUTES_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/job.h → mtapi_cpp/include/embb/mtapi/job.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_JOB_H_
 #define EMBB_MTAPI_JOB_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/mtapi.h → mtapi_cpp/include/embb/mtapi/mtapi.h

@@ -35,12 +35,12 @@
  * \ingroup CPP
  * \ingroup CPP
  */
  */
 
 
-#include <embb/mtapi_ext/job.h>
-#include <embb/mtapi_ext/action.h>
-#include <embb/mtapi_ext/group.h>
-#include <embb/mtapi_ext/queue.h>
-#include <embb/mtapi_ext/task.h>
-#include <embb/mtapi_ext/task_context.h>
-#include <embb/mtapi_ext/node.h>
+#include <embb/mtapi/job.h>
+#include <embb/mtapi/action.h>
+#include <embb/mtapi/group.h>
+#include <embb/mtapi/queue.h>
+#include <embb/mtapi/task.h>
+#include <embb/mtapi/task_context.h>
+#include <embb/mtapi/node.h>
 
 
 #endif // EMBB_MTAPI_MTAPI_H_
 #endif // EMBB_MTAPI_MTAPI_H_

mtapi_cpp_ext/include/embb/mtapi_ext/node.h → mtapi_cpp/include/embb/mtapi/node.h

@@ -29,11 +29,11 @@
 
 
 #include <embb/base/memory_allocation.h>
 #include <embb/base/memory_allocation.h>
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/status_exception.h>
-#include <embb/mtapi_ext/node_attributes.h>
-#include <embb/mtapi_ext/task.h>
-#include <embb/mtapi_ext/task_attributes.h>
-#include <embb/mtapi_ext/job.h>
+#include <embb/mtapi/status_exception.h>
+#include <embb/mtapi/node_attributes.h>
+#include <embb/mtapi/task.h>
+#include <embb/mtapi/task_attributes.h>
+#include <embb/mtapi/job.h>
 
 
 namespace embb {
 namespace embb {
 
 

mtapi_cpp_ext/include/embb/mtapi_ext/node_attributes.h → mtapi_cpp/include/embb/mtapi/node_attributes.h

@@ -29,7 +29,7 @@
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/base/core_set.h>
 #include <embb/base/core_set.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/queue.h → mtapi_cpp/include/embb/mtapi/queue.h

@@ -28,11 +28,11 @@
 #define EMBB_MTAPI_QUEUE_H_
 #define EMBB_MTAPI_QUEUE_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/job.h>
-#include <embb/mtapi_ext/task.h>
-#include <embb/mtapi_ext/group.h>
-#include <embb/mtapi_ext/queue_attributes.h>
-#include <embb/mtapi_ext/task_attributes.h>
+#include <embb/mtapi/job.h>
+#include <embb/mtapi/task.h>
+#include <embb/mtapi/group.h>
+#include <embb/mtapi/queue_attributes.h>
+#include <embb/mtapi/task_attributes.h>
 
 
 namespace embb {
 namespace embb {
 
 

mtapi_cpp_ext/include/embb/mtapi_ext/queue_attributes.h → mtapi_cpp/include/embb/mtapi/queue_attributes.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_QUEUE_ATTRIBUTES_H_
 #define EMBB_MTAPI_QUEUE_ATTRIBUTES_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/task.h → mtapi_cpp/include/embb/mtapi/task.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_TASK_H_
 #define EMBB_MTAPI_TASK_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/task_attributes.h → mtapi_cpp/include/embb/mtapi/task_attributes.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_TASK_ATTRIBUTES_H_
 #define EMBB_MTAPI_TASK_ATTRIBUTES_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/include/embb/mtapi_ext/task_context.h → mtapi_cpp/include/embb/mtapi/task_context.h

@@ -28,7 +28,7 @@
 #define EMBB_MTAPI_TASK_CONTEXT_H_
 #define EMBB_MTAPI_TASK_CONTEXT_H_
 
 
 #include <embb/mtapi/c/mtapi.h>
 #include <embb/mtapi/c/mtapi.h>
-#include <embb/mtapi_ext/internal/check_status.h>
+#include <embb/mtapi/internal/check_status.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/src/check_status.cc → mtapi_cpp/src/check_status.cc

@@ -24,10 +24,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include <embb/mtapi_ext/task_context.h>
+#include <embb/mtapi/task_context.h>
 
 
-#include <embb/mtapi_ext/internal/check_status.h>
-#include <embb/mtapi_ext/status_exception.h>
+#include <embb/mtapi/internal/check_status.h>
+#include <embb/mtapi/status_exception.h>
 #include <embb/base/internal/config.h>
 #include <embb/base/internal/config.h>
 
 
 namespace embb {
 namespace embb {

mtapi_cpp_ext/src/node.cc → mtapi_cpp/src/node.cc

@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include <embb/mtapi_ext/node.h>
+#include <embb/mtapi/node.h>
 
 
 namespace embb {
 namespace embb {
 namespace mtapi {
 namespace mtapi {

mtapi_cpp_ext/test/mtapi_cpp_test_config.h → mtapi_cpp/test/mtapi_cpp_test_config.h

@@ -28,7 +28,7 @@
 #define MTAPI_CPP_TEST_MTAPI_CPP_TEST_CONFIG_H_
 #define MTAPI_CPP_TEST_MTAPI_CPP_TEST_CONFIG_H_
 
 
 #include <partest/partest.h>
 #include <partest/partest.h>
-#include <embb/mtapi_ext/mtapi.h>
+#include <embb/mtapi/mtapi.h>
 
 
 #define THIS_DOMAIN_ID 1
 #define THIS_DOMAIN_ID 1
 #define THIS_NODE_ID 1
 #define THIS_NODE_ID 1