Skip to content

Commit

Permalink
bug-fixes from the trunk:
Browse files Browse the repository at this point in the history
- global function implementations need an explicit namespace prefix
- explicit ray-trace miss-function hook
  • Loading branch information
drossberg committed May 12, 2009
1 parent 699a844 commit 09139f8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 10 additions & 1 deletion src/coreInterface/ConstDatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,15 @@ static int HitDo
}


static int MissDo
(
application* ap
) {
// do nothing
return 0; // return won't be evaluated
}


void ConstDatabase::ShootRay
(
const Ray3D& ray,
Expand All @@ -493,7 +502,7 @@ void ConstDatabase::ShootRay
application ap = {0};

ap.a_hit = HitDo;
ap.a_miss = 0;
ap.a_miss = MissDo;
ap.a_overlap = 0;
ap.a_rt_i = m_rtip;
ap.a_level = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/coreInterface/globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static int Logger
}


void BRLCAD_COREINTERFACE_EXPORT RegisterLogHandler
void BRLCAD_COREINTERFACE_EXPORT BRLCAD::RegisterLogHandler
(
LogHandler& logHandler
) throw(bad_alloc) {
Expand All @@ -67,7 +67,7 @@ void BRLCAD_COREINTERFACE_EXPORT RegisterLogHandler
}


void BRLCAD_COREINTERFACE_EXPORT DeRegisterLogHandler
void BRLCAD_COREINTERFACE_EXPORT BRLCAD::DeRegisterLogHandler
(
LogHandler& logHandler
) throw() {
Expand Down

0 comments on commit 09139f8

Please sign in to comment.