Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r796 - in trunk: Core/Util fox
- Date: Mon, 19 Dec 2005 15:16:01 -0700 (MST)
Author: abe
Date: Mon Dec 19 15:16:01 2005
New Revision: 796
Modified:
trunk/Core/Util/ThreadStorage.h
trunk/fox/dm_demo.cc
Log:
Fixed compiler error on gcc4
M Core/Util/ThreadStorage.h
Added check to see if camera specified on command line is valid.
M fox/dm_demo.cc
Modified: trunk/Core/Util/ThreadStorage.h
==============================================================================
--- trunk/Core/Util/ThreadStorage.h (original)
+++ trunk/Core/Util/ThreadStorage.h Mon Dec 19 15:16:01 2005
@@ -51,6 +51,8 @@
size_t requested;
public:
+
+ class Allocator;
///////////////////////////////////////////////////////////////////////////
// Token is returned by an allocation request.
@@ -59,6 +61,7 @@
// using a token and proc number.
class Token {
friend class ThreadStorage;
+ friend class Allocator;
private:
size_t offset;
size_t size;
Modified: trunk/fox/dm_demo.cc
==============================================================================
--- trunk/fox/dm_demo.cc (original)
+++ trunk/fox/dm_demo.cc Mon Dec 19 15:16:01 2005
@@ -236,7 +236,12 @@
manta_window.addCameraBookmark( "Default", default_camera );
// Create the camera using the first camera bookmark.
- Camera *camera = manta_interface->createCamera(
manta_window.getCameraBookmark( 0 ) );
+ Camera *camera = 0;
+ if ((camera = manta_interface->createCamera(
manta_window.getCameraBookmark( 0 ) )) == 0) {
+
+ std::cerr << "Error could not create camera: " << default_camera <<
std::endl;
+ return 1;
+ }
// Create a default quake navigator.
FMantaQuakeNav *quake_nav = new FMantaQuakeNav( false );
- [MANTA] r796 - in trunk: Core/Util fox, abe, 12/19/2005
Archive powered by MHonArc 2.6.16.