Revision: 55894
http://sourceforge.net/p/brlcad/code/55894
Author: r_weiss
Date: 2013-06-28 20:52:51 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Fixed some DLL errors in the Windows build.
Modified Paths:
--------------
brlcad/trunk/include/common.h
brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp
brlcad/trunk/src/libbrep/libbrep_brep_tools.h
Modified: brlcad/trunk/include/common.h
===================================================================
--- brlcad/trunk/include/common.h 2013-06-28 19:57:12 UTC (rev 55893)
+++ brlcad/trunk/include/common.h 2013-06-28 20:52:51 UTC (rev 55894)
@@ -257,7 +257,11 @@
#else
# undef IGNORE
# define IGNORE(parameter) (void)(parameter)
-# warning "IGNORE was previously defined. Parameter declaration behavior is
unknown, see common.h"
+# if defined(_MSC_VER)
+# pragma warning("IGNORE was previously defined. Parameter declaration
behavior is unknown, see common.h")
+# else
+# warning "IGNORE was previously defined. Parameter declaration behavior
is unknown, see common.h"
+# endif
#endif
/**
Modified: brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp
===================================================================
--- brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp 2013-06-28 19:57:12 UTC
(rev 55893)
+++ brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp 2013-06-28 20:52:51 UTC
(rev 55894)
@@ -27,6 +27,7 @@
#include "opennurbs.h"
#include "bu.h"
+#include "libbrep_brep_tools.h"
bool ON_NearZero(double val, double epsilon) {
return (val > -epsilon) && (val < epsilon);
Modified: brlcad/trunk/src/libbrep/libbrep_brep_tools.h
===================================================================
--- brlcad/trunk/src/libbrep/libbrep_brep_tools.h 2013-06-28 19:57:12 UTC
(rev 55893)
+++ brlcad/trunk/src/libbrep/libbrep_brep_tools.h 2013-06-28 20:52:51 UTC
(rev 55894)
@@ -30,6 +30,7 @@
#include <vector>
#include "opennurbs.h"
+#include "brep.h"
/* Directions */
#ifndef NE
@@ -46,15 +47,15 @@
#endif
-#ifndef NURBS_EXPORT
-# if defined(NURBS_DLL_EXPORTS) && defined(NURBS_DLL_IMPORTS)
-# error "Only NURBS_DLL_EXPORTS or NURBS_DLL_IMPORTS can be defined, not
both."
-# elif defined(NURBS_DLL_EXPORTS)
-# define NURBS_EXPORT __declspec(dllexport)
-# elif defined(NURBS_DLL_IMPORTS)
-# define NURBS_EXPORT __declspec(dllimport)
+#ifndef BREP_EXPORT
+# if defined(BREP_DLL_EXPORTS) && defined(BREP_DLL_IMPORTS)
+# error "Only BREP_DLL_EXPORTS or BREP_DLL_IMPORTS can be defined, not
both."
+# elif defined(BREP_DLL_EXPORTS)
+# define BREP_EXPORT __declspec(dllexport)
+# elif defined(BREP_DLL_IMPORTS)
+# define BREP_EXPORT __declspec(dllimport)
# else
-# define NURBS_EXPORT
+# define BREP_EXPORT
# endif
#endif
@@ -67,7 +68,7 @@
@return @c true if the value is within the near-zero interval specified by
epsilon, @c false otherwise.
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_NearZero(double val, double epsilon);
@@ -82,7 +83,7 @@
@return @c 0 if there are no tangent points in the interval, @c 1 if there
is a single vertical tangent,
@c 2 if there is a single horizontal tangent, and @c 3 if multiple tangents
are present.
*/
-NURBS_EXPORT
+BREP_EXPORT
int ON_Curve_Has_Tangent(const ON_Curve* curve, double ct_min, double ct_max,
double t_tol);
@@ -151,7 +152,7 @@
@param frames Array of 9 frenet frames
@param f_tol Flatness tolerance - 0 always evaluates to flat, 1 would be a
perfectly flat surface. Generally something in the range 0.8-0.9 should suffice
in raytracing subdivision (per <a
href="http://www.uni-koblenz.de/~cg/Diplomarbeiten/DA_Oliver_Abert.pdf";>Abert,
2005</a>)
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_Surface_IsFlat(ON_Plane *frames, double f_tol);
/**
@@ -162,7 +163,7 @@
@param frames Array of 9 frenet frames
@param s_tol Straightness tolerance - 0 always evaluates to straight, 1
requires perfect straightness
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_Surface_IsFlat_U(ON_Plane *frames, double f_tol);
@@ -174,7 +175,7 @@
@param frames Array of 9 frenet frames
@param s_tol Straightness tolerance - 0 always evaluates to straight, 1
requires perfect straightness
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_Surface_IsFlat_V(ON_Plane *frames, double f_tol);
@@ -188,7 +189,7 @@
@param frames Array of 9 frenet frames
@param s_tol Straightness tolerance - 0 always evaluates to straight, 1
requires perfect straightness
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_Surface_IsStraight(ON_Plane *frames, double s_tol);
@@ -216,7 +217,7 @@
is the same as the parent surface, @c false if one or more split
operations failed.
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_Surface_SubSurface(
const ON_Surface *srf,
ON_Interval *u_val,
@@ -267,7 +268,7 @@
operations failed, the q* containers are not NULL, or the upt,vpt
coordinates are
not contained within the UV interval.
*/
-NURBS_EXPORT
+BREP_EXPORT
bool ON_Surface_Quad_Split(
const ON_Surface *srf,
const ON_Interval& u,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
