Revision: 68937
          http://sourceforge.net/p/brlcad/code/68937
Author:   brlcad
Date:     2016-09-30 03:53:52 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
compile first, need the c++ headers protected

Modified Paths:
--------------
    brlcad/trunk/include/brep/brnode.h
    brlcad/trunk/include/brep/curvetree.h
    brlcad/trunk/include/brep/util.h

Modified: brlcad/trunk/include/brep/brnode.h
===================================================================
--- brlcad/trunk/include/brep/brnode.h  2016-09-30 03:42:19 UTC (rev 68936)
+++ brlcad/trunk/include/brep/brnode.h  2016-09-30 03:53:52 UTC (rev 68937)
@@ -17,7 +17,8 @@
  * License along with this file; see the file named COPYING for more
  * information.
  */
-
+/** @{ */
+/** @file brep/brnode.h */
 /** @addtogroup brep_brnode
  *
  * @brief
@@ -28,23 +29,21 @@
 #define BREP_BRNODE_H
 
 #include "common.h"
+
 #ifdef __cplusplus
 extern "C++" {
 /* @cond */
-#include <vector>
-#include <list>
+#  include <vector>
+#  include <list>
 /* @endcond */
 }
 #endif
+
 #include "brep.h"
 
-/** @{ */
-/** @file brep/brnode.h */
+__BEGIN_DECLS
 
 #ifdef __cplusplus
-
-__BEGIN_DECLS
-
 extern "C++" {
     namespace brlcad {
 

Modified: brlcad/trunk/include/brep/curvetree.h
===================================================================
--- brlcad/trunk/include/brep/curvetree.h       2016-09-30 03:42:19 UTC (rev 
68936)
+++ brlcad/trunk/include/brep/curvetree.h       2016-09-30 03:53:52 UTC (rev 
68937)
@@ -32,13 +32,17 @@
 #include "common.h"
 
 #ifdef __cplusplus
+extern "C++" {
+#  include <map>
+}
+#endif
 
-#include <map>
-
 #include "brep.h"
 
+
 __BEGIN_DECLS
 
+#ifdef __cplusplus
 extern "C++" {
 
     namespace brlcad {

Modified: brlcad/trunk/include/brep/util.h
===================================================================
--- brlcad/trunk/include/brep/util.h    2016-09-30 03:42:19 UTC (rev 68936)
+++ brlcad/trunk/include/brep/util.h    2016-09-30 03:53:52 UTC (rev 68937)
@@ -32,9 +32,11 @@
 #include "common.h"
 
 #ifdef __cplusplus
+extern "C++" {
+#  include <cstring>
+}
+#endif
 
-#include <cstring>
-
 #include "brep.h"
 
 #include "bu/cv.h"
@@ -43,8 +45,10 @@
 #include "bu/malloc.h"
 #include "bu/parse.h"
 
+
 __BEGIN_DECLS
 
+#ifdef __cplusplus
 extern "C++" {
 
     BREP_EXPORT bool ON_NearZero(double x, double tolerance = 
ON_ZERO_TOLERANCE);

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

Reply via email to