Revision: 42101
http://brlcad.svn.sourceforge.net/brlcad/?rev=42101&view=rev
Author: brlcad
Date: 2011-01-11 23:47:24 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
the ON_OBJECT_IMPLEMENT() and ON_VIRTUAL_OBJECT_IMPLEMENT() macros are followed
in code with semicolons so the macro itself needs to end with a statement that
requires a semicolon. a simple reordering of the first line suffices.
remainder of fixes are stray semicolons mysteriously following functions.
Modified Paths:
--------------
brlcad/trunk/src/other/openNURBS/opennurbs_3dm_properties.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_3dm_settings.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_archive.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_bounding_box.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_object.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_object.h
brlcad/trunk/src/other/openNURBS/opennurbs_point.cpp
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_3dm_properties.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_3dm_properties.cpp
2011-01-11 23:24:58 UTC (rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_3dm_properties.cpp
2011-01-11 23:47:24 UTC (rev 42101)
@@ -315,7 +315,7 @@
ON_3dmProperties::ON_3dmProperties()
{
Default();
-};
+}
ON_3dmProperties::~ON_3dmProperties()
{
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_3dm_settings.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_3dm_settings.cpp 2011-01-11
23:24:58 UTC (rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_3dm_settings.cpp 2011-01-11
23:47:24 UTC (rev 42101)
@@ -2540,7 +2540,7 @@
ON_3dmSettings::ON_3dmSettings()
{
Default();
-};
+}
ON_3dmSettings::~ON_3dmSettings()
{
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_archive.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_archive.cpp 2011-01-11
23:24:58 UTC (rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_archive.cpp 2011-01-11
23:47:24 UTC (rev 42101)
@@ -9517,7 +9517,7 @@
DimDiameter = 7 ,
DimRadius = 8,
Leader = 9,
- DimLinear = 10,
+ DimLinear = 10
};
bool rc = false;
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_bounding_box.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_bounding_box.cpp 2011-01-11
23:24:58 UTC (rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_bounding_box.cpp 2011-01-11
23:47:24 UTC (rev 42101)
@@ -1054,7 +1054,7 @@
m_min.z<=p.z && p.z<=m_max.z;
}
return bIn;
-};
+}
ON_3dPoint ON_BoundingBox::ClosestPoint(
const ON_3dPoint& test_point
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_object.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_object.cpp 2011-01-11
23:24:58 UTC (rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_object.cpp 2011-01-11
23:47:24 UTC (rev 42101)
@@ -1053,7 +1053,7 @@
m_class_id=0;
m_parent_node=0;
m_depth=0;
-};
+}
ON__ClassIdDumpNode::~ON__ClassIdDumpNode()
{
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_object.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_object.h 2011-01-11 23:24:58 UTC
(rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_object.h 2011-01-11 23:47:24 UTC
(rev 42101)
@@ -332,14 +332,14 @@
// The Cast() and ClassId() members work on objects defined with either
// ON_VIRTUAL_OBJECT_IMPLEMENT or ON_OBJECT_IMPLEMENT.
#define ON_VIRTUAL_OBJECT_IMPLEMENT( cls, basecls, uuid ) \
- void* cls::m_s_##cls##_ptr = 0;\
const ON_ClassId cls::m_##cls##_class_id(#cls,#basecls,0,0,uuid);\
cls * cls::Cast( ON_Object* p) {return(cls *)Cast((const ON_Object*)p);} \
const cls * cls::Cast( const ON_Object* p)
{return(p&&p->IsKindOf(&cls::m_##cls##_class_id))?(const cls *)p:0;} \
const ON_ClassId* cls::ClassId() const {return &cls::m_##cls##_class_id;} \
ON_Object* cls::DuplicateObject() const {return 0;} \
bool cls::Copy##cls( const ON_Object*, ON_Object* ) {return false;} \
- cls * cls::Duplicate() const {return static_cast<cls *>(DuplicateObject());}
+ cls * cls::Duplicate() const {return static_cast<cls *>(DuplicateObject());}
\
+ void* cls::m_s_##cls##_ptr = 0
// Objects derived from ON_Object that use ON_OBJECT_IMPLEMENT must
// have a valid operator= and copy constructor. Objects defined with
@@ -347,7 +347,6 @@
// ON_BinaryArchive::ReadObject()/WriteObject()
// and duplicated by calling ON_Object::Duplicate().
#define ON_OBJECT_IMPLEMENT( cls, basecls, uuid ) \
- void* cls::m_s_##cls##_ptr = 0;\
static ON_Object* CreateNew##cls() {return new cls();} \
const ON_ClassId
cls::m_##cls##_class_id(#cls,#basecls,CreateNew##cls,cls::Copy##cls,uuid);\
cls * cls::Cast( ON_Object* p) {return(cls *)Cast((const ON_Object*)p);} \
@@ -355,7 +354,8 @@
const ON_ClassId* cls::ClassId() const {return &cls::m_##cls##_class_id;} \
ON_Object* cls::DuplicateObject() const {cls* p = new cls(); if (p)
*p=*this; return p;} \
bool cls::Copy##cls( const ON_Object* src, ON_Object* dst ){cls* d;const
cls* s;if (0!=(s=cls::Cast(src))&&0!=(d=cls::Cast(dst)))
{d->cls::operator=(*s);return true;}return false;} \
- cls * cls::Duplicate() const {return static_cast<cls *>(DuplicateObject());}
+ cls * cls::Duplicate() const {return static_cast<cls *>(DuplicateObject());}
\
+ void* cls::m_s_##cls##_ptr = 0
#define ON__SET__THIS__PTR(ptr) if (ptr) *((void**)this) = ptr
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_point.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_point.cpp 2011-01-11
23:24:58 UTC (rev 42100)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_point.cpp 2011-01-11
23:47:24 UTC (rev 42101)
@@ -6711,7 +6711,7 @@
&& ON_IS_VALID(m_min.z)
&& ON_IS_VALID(m_max.z)
);
-};
+}
bool ON_IsDegenrateConicHelper(double A, double B, double C, double D, double
E)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
