Text archives Help
- From:
- To:
- Subject: [Manta] r2316 - in trunk: . Core/Exceptions Core/Geometry Core/Math Core/Persistent Core/Thread Core/Util Engine/Control Engine/Display Interface Model/Groups/BSP Model/Materials Model/Primitives tests
- Date: Wed, 20 Aug 2008 13:41:17 -0600 (MDT)
Author: abe
Date: Wed Aug 20 13:41:14 2008
New Revision: 2316
Modified:
trunk/Core/Exceptions/ErrnoException.cc
trunk/Core/Geometry/ScalarTransform1D.h
trunk/Core/Math/KorobovRNG.h
trunk/Core/Persistent/XMLArchive.cc
trunk/Core/Thread/Thread_pthreads.cc
trunk/Core/Thread/Time_unix.cc
trunk/Core/Util/Args.cc
trunk/Core/Util/CPUTime.cc
trunk/Core/Util/ThreadStorage.cc
trunk/Doxyfile
trunk/Engine/Control/RTRT.cc
trunk/Engine/Display/PureOpenGLDisplay.cc
trunk/Interface/AccelerationStructure.h
trunk/Interface/RayPacket.h
trunk/Model/Groups/BSP/Geometry.cc
trunk/Model/Materials/Volume.cc
trunk/Model/Primitives/OctreeVolume.cc
trunk/tests/atomic_counter.cc
Log:
Applied a patch for GCC 4.3 and tested on linux-gcc 4.1.2, linux-gcc
4.3, osx-4.0.1.
M Doxyfile
M Core/Persistent/XMLArchive.cc
M Core/Exceptions/ErrnoException.cc
M Core/Thread/Time_unix.cc
M Core/Thread/Thread_pthreads.cc
M Core/Math/KorobovRNG.h
M Core/Geometry/ScalarTransform1D.h
M Core/Util/Args.cc
M Core/Util/CPUTime.cc
M Core/Util/ThreadStorage.cc
M Interface/AccelerationStructure.h
M Interface/RayPacket.h
M Model/Groups/BSP/Geometry.cc
M Model/Materials/Volume.cc
M Model/Primitives/OctreeVolume.cc
M tests/atomic_counter.cc
M Engine/Control/RTRT.cc
M Engine/Display/PureOpenGLDisplay.cc
Modified: trunk/Core/Exceptions/ErrnoException.cc
==============================================================================
--- trunk/Core/Exceptions/ErrnoException.cc (original)
+++ trunk/Core/Exceptions/ErrnoException.cc Wed Aug 20 13:41:14 2008
@@ -43,6 +43,7 @@
#include <Core/Exceptions/ErrnoException.h>
#include <sstream>
#include <iostream>
+#include <cstring>
namespace Manta {
Modified: trunk/Core/Geometry/ScalarTransform1D.h
==============================================================================
--- trunk/Core/Geometry/ScalarTransform1D.h (original)
+++ trunk/Core/Geometry/ScalarTransform1D.h Wed Aug 20 13:41:14 2008
@@ -38,7 +38,7 @@
inline int getLookupIndex(const LType value, const LType min_,
const LType max_) const {
int idx=static_cast<int>((value - min_)/(max_ - min_)*results->size()
- 1);
- return Clamp(index, 0, results->size() - 1);
+ return Clamp(idx, 0, results->size() - 1);
}
inline RType lookup(const LType value, const LType min_,
Modified: trunk/Core/Math/KorobovRNG.h
==============================================================================
--- trunk/Core/Math/KorobovRNG.h (original)
+++ trunk/Core/Math/KorobovRNG.h Wed Aug 20 13:41:14 2008
@@ -34,6 +34,7 @@
#include <Core/Exceptions/InternalError.h>
#include <Core/Math/SSEDefs.h>
+#include <climits>
namespace Manta {
Modified: trunk/Core/Persistent/XMLArchive.cc
==============================================================================
--- trunk/Core/Persistent/XMLArchive.cc (original)
+++ trunk/Core/Persistent/XMLArchive.cc Wed Aug 20 13:41:14 2008
@@ -8,6 +8,7 @@
#include <map>
#include <sstream>
#include <string>
+#include <cstring>
using namespace Manta;
using namespace std;
Modified: trunk/Core/Thread/Thread_pthreads.cc
==============================================================================
--- trunk/Core/Thread/Thread_pthreads.cc (original)
+++ trunk/Core/Thread/Thread_pthreads.cc Wed Aug 20 13:41:14 2008
@@ -88,6 +88,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string>
+#include <cstring>
#include <unistd.h>
#include <fstream>
#include <string>
Modified: trunk/Core/Thread/Time_unix.cc
==============================================================================
--- trunk/Core/Thread/Time_unix.cc (original)
+++ trunk/Core/Thread/Time_unix.cc Wed Aug 20 13:41:14 2008
@@ -50,6 +50,7 @@
#ifdef __linux
#include <time.h>
#endif
+#include <cstring>
static bool initialized=false;
static struct timeval start_time;
Modified: trunk/Core/Util/Args.cc
==============================================================================
--- trunk/Core/Util/Args.cc (original)
+++ trunk/Core/Util/Args.cc Wed Aug 20 13:41:14 2008
@@ -3,6 +3,7 @@
#include <Core/Exceptions/IllegalValue.h>
#include <Core/Geometry/Vector.h>
#include <Core/Color/ColorDB.h>
+#include <cstdlib>
using namespace std;
Modified: trunk/Core/Util/CPUTime.cc
==============================================================================
--- trunk/Core/Util/CPUTime.cc (original)
+++ trunk/Core/Util/CPUTime.cc Wed Aug 20 13:41:14 2008
@@ -15,6 +15,9 @@
# include <Core/Thread/Time.h>
#endif
+#include <cstring>
+#include <cstdlib>
+
using namespace Manta;
static bool initialized=false;
Modified: trunk/Core/Util/ThreadStorage.cc
==============================================================================
--- trunk/Core/Util/ThreadStorage.cc (original)
+++ trunk/Core/Util/ThreadStorage.cc Wed Aug 20 13:41:14 2008
@@ -28,6 +28,7 @@
#include <Core/Util/ThreadStorage.h>
#include <Interface/Context.h>
+#include <cstdlib>
using namespace Manta;
Modified: trunk/Doxyfile
==============================================================================
--- trunk/Doxyfile (original)
+++ trunk/Doxyfile Wed Aug 20 13:41:14 2008
@@ -242,7 +242,7 @@
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = NO
HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
+HAVE_DOT = YES
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
Modified: trunk/Engine/Control/RTRT.cc
==============================================================================
--- trunk/Engine/Control/RTRT.cc (original)
+++ trunk/Engine/Control/RTRT.cc Wed Aug 20 13:41:14 2008
@@ -67,7 +67,7 @@
#include <sstream>
#include <iostream>
-
+#include <algorithm>
#include <Interface/Material.h>
Modified: trunk/Engine/Display/PureOpenGLDisplay.cc
==============================================================================
--- trunk/Engine/Display/PureOpenGLDisplay.cc (original)
+++ trunk/Engine/Display/PureOpenGLDisplay.cc Wed Aug 20 13:41:14 2008
@@ -57,6 +57,7 @@
#include <iostream>
#include <typeinfo>
+#include <cstring>
#ifdef __APPLE__
// For some reason, apple has these extensions but doesn't have the proper
Modified: trunk/Interface/AccelerationStructure.h
==============================================================================
--- trunk/Interface/AccelerationStructure.h (original)
+++ trunk/Interface/AccelerationStructure.h Wed Aug 20 13:41:14 2008
@@ -2,6 +2,7 @@
#define Manta_Interface_AccelerationStructure_h
#include <Interface/Object.h>
+#include <string>
namespace Manta {
Modified: trunk/Interface/RayPacket.h
==============================================================================
--- trunk/Interface/RayPacket.h (original)
+++ trunk/Interface/RayPacket.h Wed Aug 20 13:41:14 2008
@@ -49,6 +49,8 @@
#endif
#include <iosfwd>
+#include <cstring>
+
namespace Manta {
class Material;
class RenderContext;
Modified: trunk/Model/Groups/BSP/Geometry.cc
==============================================================================
--- trunk/Model/Groups/BSP/Geometry.cc (original)
+++ trunk/Model/Groups/BSP/Geometry.cc Wed Aug 20 13:41:14 2008
@@ -2,6 +2,8 @@
#include <Core/Geometry/AffineTransformT.h>
#include <Model/Groups/BSP/aip.h>
#include <set>
+#include <algorithm>
+
using namespace std;
namespace Manta {
Modified: trunk/Model/Materials/Volume.cc
==============================================================================
--- trunk/Model/Materials/Volume.cc (original)
+++ trunk/Model/Materials/Volume.cc Wed Aug 20 13:41:14 2008
@@ -1,5 +1,7 @@
#include <Model/Materials/Volume.h>
+#include <algorithm>
+
using namespace std;
namespace Manta
Modified: trunk/Model/Primitives/OctreeVolume.cc
==============================================================================
--- trunk/Model/Primitives/OctreeVolume.cc (original)
+++ trunk/Model/Primitives/OctreeVolume.cc Wed Aug 20 13:41:14 2008
@@ -13,6 +13,7 @@
#include <Model/Primitives/OctreeVolume.h>
#include <Core/Util/LargeFile.h>
+#include <cstring>
using namespace Manta;
Modified: trunk/tests/atomic_counter.cc
==============================================================================
--- trunk/tests/atomic_counter.cc (original)
+++ trunk/tests/atomic_counter.cc Wed Aug 20 13:41:14 2008
@@ -39,6 +39,7 @@
using std::cerr;
#include <stdio.h>
#include <stdlib.h>
+#include <cstring>
#ifndef _WIN32
#include <unistd.h>
- [Manta] r2316 - in trunk: . Core/Exceptions Core/Geometry Core/Math Core/Persistent Core/Thread Core/Util Engine/Control Engine/Display Interface Model/Groups/BSP Model/Materials Model/Primitives tests, abe, 08/20/2008
Archive powered by MHonArc 2.6.16.