Get ggma_macro.h out of public header

Author: glistening

runtime/ggma/CMakeLists.txt

@@ -8,7 +8,7 @@ set(GGMA_DEV ggma-dev)
 add_library(${GGMA_DEV} SHARED ${API_SRC})
 
 # Public headers to publish
-set(GGMA_API_HEADERS include/ggma_api.h include/ggma_macro.h include/ggma_types.h
+set(GGMA_API_HEADERS include/ggma_api.h include/ggma_types.h
                      include/ggma_context.h include/ggma_generate.h)
 
 # GGMA install directory (same as ONERT_INSTALL_APIDIR)

runtime/ggma/include/ggma_macro.h runtime/ggma/src/Macro.hruntime/ggma/include/ggma_macro.h renamed to runtime/ggma/src/Macro.h

@@ -17,20 +17,11 @@
 #include <cstdlib>
 
 /**
- * @file  ggma_macro.h
+ * @file  Macro.h
  * @brief Common macros for GGMA error handling and utilities
  */
-#ifndef __GGMA_GGMA_MACRO_H__
-#define __GGMA_GGMA_MACRO_H__
-
-#define GGMA_ENSURE(a)               \
-  do                                 \
-  {                                  \
-    if ((a) != GGMA_STATUS_NO_ERROR) \
-    {                                \
-      exit(-1);                      \
-    }                                \
-  } while (0)
+#ifndef __GGMA_MACRO_H__
+#define __GGMA_MACRO_H__
 
 #define GGMA_RETURN_ERROR_IF_NULL(p)      \
   do                                      \
@@ -41,4 +32,4 @@
 
 #define GGMA_UNUSED(x) (void)(x)
 
-#endif // __GGMA_GGMA_MACRO_H__
+#endif // __GGMA_MACRO_H__

runtime/ggma/src/ggma_context.cc

@@ -15,7 +15,6 @@
  */
 
 #include "ggma_context.h"
-#include "ggma_macro.h"
 #include "Context.h"
 #include <iostream>
 

runtime/ggma/src/ggma_generate.cc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "ggma_api.h"
-#include "ggma_macro.h"
+#include "ggma_generate.h"
 
 #include "Context.h"
+#include "Macro.h"
 
 GGMA_STATUS ggma_generate(ggma_context *context, ggma_token *tokens, size_t n_tokens,
                           size_t n_tokens_max, size_t *n_tokens_out)