Revision: 68936
http://sourceforge.net/p/brlcad/code/68936
Author: brlcad
Date: 2016-09-30 03:42:19 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
more and better header inclusion cleanup, make the files work for C too
Modified Paths:
--------------
brlcad/trunk/include/brep/curvetree.h
brlcad/trunk/include/brep/util.h
Modified: brlcad/trunk/include/brep/curvetree.h
===================================================================
--- brlcad/trunk/include/brep/curvetree.h 2016-09-30 03:33:36 UTC (rev
68935)
+++ brlcad/trunk/include/brep/curvetree.h 2016-09-30 03:42:19 UTC (rev
68936)
@@ -17,31 +17,30 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-
+/** @{ */
+/** @file brep/curvetree.h */
/** @addtogroup brep_curvetree
*
* @brief
* Curve Tree.
*
*/
+
#ifndef BREP_CURVETREE_H
#define BREP_CURVETREE_H
#include "common.h"
-/** @{ */
-/** @file brep/curvetree.h */
-
#ifdef __cplusplus
+#include <map>
+
+#include "brep.h"
+
__BEGIN_DECLS
extern "C++" {
-#include <map>
-
-#include "brep.h"
-
namespace brlcad {
/**
@@ -105,13 +104,13 @@
mutable std::map<const BRNode *, std::size_t>
*m_sortedX_indices;
};
+ } /* namespace brlcad */
- } /* namespace brlcad */
} /* extern C++ */
__END_DECLS
-#endif
+#endif /* __cplusplus */
/** @} */
Modified: brlcad/trunk/include/brep/util.h
===================================================================
--- brlcad/trunk/include/brep/util.h 2016-09-30 03:33:36 UTC (rev 68935)
+++ brlcad/trunk/include/brep/util.h 2016-09-30 03:42:19 UTC (rev 68936)
@@ -17,23 +17,24 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-
+/** @{ */
+/** @file brep/util.h */
/** @addtogroup brep_util
*
* @brief
* These are utility routines for libbrep, used throughout the library.
*
*/
+
#ifndef BREP_UTIL_H
#define BREP_UTIL_H
#include "common.h"
-/** @{ */
-/** @file brep/util.h */
-
#ifdef __cplusplus
+#include <cstring>
+
#include "brep.h"
#include "bu/cv.h"
@@ -42,12 +43,9 @@
#include "bu/malloc.h"
#include "bu/parse.h"
-#include <arpa/inet.h>
-
__BEGIN_DECLS
extern "C++" {
-#include <cstring>
BREP_EXPORT bool ON_NearZero(double x, double tolerance =
ON_ZERO_TOLERANCE);
@@ -333,12 +331,11 @@
}
};
-
} /* extern C++ */
__END_DECLS
-#endif /* __cplusplus */
+#endif /* __cplusplus */
/** @} */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
