From 7d853cc3b11a92372c6d58d5acdbd04cef1b321b Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougsys.fr>
Date: Thu, 17 Apr 2014 10:19:23 +0200
Subject: [PATCH] Fix remaining compiler errors since renaming the library to
 'gmio'

---
 CMakeLists.txt                | 14 +++++++-------
 src/gmio_core/config.h.cmake  | 12 ------------
 src/gmio_support/occ_libstl.h |  8 ++++----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f998135..55c09ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,11 @@ file(GLOB  ALL_SRC_FILES  src/gmio_core/*  src/gmio_core/internal/*)
 set(ALL_SRC_FILES  ${ALL_SRC_FILES})
 
 # Have <stdint.h> ?
-check_include_files(stdint.h FOUG_HAVE_STDINT_H)
+check_include_files(stdint.h GMIO_HAVE_STDINT_H)
 
 # Have strtof() ?
 if(NOT BUILD_STRICT_C90)
-  check_function_exists(strtof FOUG_HAVE_STRTOF_FUNC)
+  check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC)
 endif()
 
 # Have builtin byte swap functions ?
@@ -30,13 +30,13 @@ if(CMAKE_COMPILER_IS_GNUCC)
   # __builtin_bswap16() is missing in x86 GCC version prior to v4.7
   # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
   check_c_source_compiles("int main() { return (int)__builtin_bswap16(0x1122); }"
-                           FOUG_HAVE_GCC_BUILTIN_BSWAP16_FUNC)
+                           GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC)
   check_c_source_compiles("int main() { return (int)__builtin_bswap32(0x11223344); }"
-                           FOUG_HAVE_GCC_BUILTIN_BSWAP32_FUNC)
+                           GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC)
 elseif(MSVC)
   check_c_source_compiles("#include <stdlib.h>
                            int main() { return (int)_byteswap_ulong(0x11223344); }"
-                          FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC)
+                          GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC)
 endif()
 
 configure_file(src/gmio_core/config.h.cmake config.h @ONLY)
@@ -60,8 +60,8 @@ if(MSVC)
 endif()
 
 if(BUILD_SHARED_LIBS)
-  add_definitions(-DFOUG_LIB_DLL
-                  -DFOUG_LIB_MAKE_DLL)
+  add_definitions(-DGMIO_LIB_DLL
+                  -DGMIO_LIB_MAKE_DLL)
 endif()
 
 # Declare installs
diff --git a/src/gmio_core/config.h.cmake b/src/gmio_core/config.h.cmake
index 6ab557f..357df6f 100644
--- a/src/gmio_core/config.h.cmake
+++ b/src/gmio_core/config.h.cmake
@@ -3,24 +3,12 @@
 #ifndef GMIO_CONFIG_H_CMAKE
 #define GMIO_CONFIG_H_CMAKE
 
-#ifndef GMIO_HAVE_STDINT_H
 #cmakedefine GMIO_HAVE_STDINT_H
-#endif
-
-#ifndef GMIO_HAVE_STRTOF_FUNC
 #cmakedefine GMIO_HAVE_STRTOF_FUNC
-#endif
 
-#ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC
 #cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC
-#endif
-
-#ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC
 #cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC
-#endif
 
-#ifndef GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC
 #cmakedefine GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC
-#endif
 
 #endif /* GMIO_CONFIG_H_CMAKE */
diff --git a/src/gmio_support/occ_libstl.h b/src/gmio_support/occ_libstl.h
index 6ad107b..227903a 100644
--- a/src/gmio_support/occ_libstl.h
+++ b/src/gmio_support/occ_libstl.h
@@ -3,8 +3,8 @@
 
 #include "support_global.h"
 #include <Handle_StlMesh_Mesh.hxx>
-struct gmio_stl_geom;
-struct gmio_stl_geom_creator;
+struct gmio_stl_mesh;
+struct gmio_stl_mesh_creator;
 
 class GMIO_LIBSUPPORT_EXPORT gmio_OccStlMeshDomain
 {
@@ -23,9 +23,9 @@ private:
 };
 
 GMIO_LIBSUPPORT_EXPORT
-void gmio_stl_occmesh(gmio_stl_geom* geom, const gmio_OccStlMeshDomain& meshCookie);
+void gmio_stl_occmesh(gmio_stl_mesh* mesh, const gmio_OccStlMeshDomain& meshCookie);
 
 GMIO_LIBSUPPORT_EXPORT
-void gmio_stl_occmesh_creator(gmio_stl_geom_creator* creator, const Handle_StlMesh_Mesh& mesh);
+void gmio_stl_occmesh_creator(gmio_stl_mesh_creator* creator, const Handle_StlMesh_Mesh& mesh);
 
 #endif /* GMIO_SUPPORT_OCC_LIBSTL_H */