Blob Blame History Raw
diff -r 6b379ae667ab src/basics.cpp
--- src/basics.cpp	Sun Dec 18 21:00:25 2011 +0000
+++ src/basics.cpp	Sun Dec 18 21:00:47 2011 +0000
@@ -719,15 +719,12 @@
 #else
 	const unsigned int NUM_FUZZY_ENTRIES=16;
 #endif
-	//Sorted sequence of fuzzy times, from biggest to smallest
+	//Sorted sequence of fuzzy, approximate times, from biggest to smallest
 	const time_t TIMESTOPS[] = {
-#ifndef WIN32
-					(100*365.25*24*60*60), //One century
-#endif			
-					(10*365.25*24*60*60), //One decade
-					(365.25*24*60*60), // One year
-					(365.25/12.0*24*60*60), // One month
-					(7.0*24*60*60), //One week
+					(10*36525*24*6*6), //One decade (factor of 100 taken to prevent invalid C++11 narrowing double)
+					(36525*24*6*6), // One year
+					(36525/12*24*6*6), // One month (factor of 100 taken from minutes and hrs to prevent invalid C++11 narrowing double code)
+					(7*24*60*60), //One week
 					(24*60*60), //One day
 					(60*60), //One hour
 					(45*60),// 45 minutes
@@ -744,9 +741,6 @@
 
 	//Do these have a meaningful plural?
 	bool HAVE_PLURALS[] = { 
-#ifndef WIN32	
-					true,//Century
-#endif
 					true,	//decade	
 					true,	//year
 					true,	//month
@@ -767,9 +761,6 @@
 		
 	//Singular version
 	const char *SINGLE_FUZZY_STRING[] = {
-#ifndef WIN32
-			 NTRANS("a century ago"),
-#endif
 			 NTRANS("a decade ago"),
 			 NTRANS("a year ago"),
 			 NTRANS("a month ago"),
diff -r 6b379ae667ab src/effect.h
--- src/effect.h	Sun Dec 18 21:00:25 2011 +0000
+++ src/effect.h	Sun Dec 18 21:00:47 2011 +0000
@@ -70,6 +70,8 @@
 		static BoundCube bc;
 		unsigned int effectType;
 	public:
+		Effect(){};
+		virtual ~Effect() {};
 		virtual void enable(unsigned int pass=0) const =0;
 		virtual void disable() const=0;
 		std::string getName() const;
@@ -112,7 +114,7 @@
 		void doClip(const Point3D &origin, const Point3D & normal,unsigned int glOffset) const;
 	public:
 		BoxCropEffect(){useCamCoordinates=false;effectType=EFFECT_BOX_CROP;openGLIdStart=0; }
-		~BoxCropEffect(){}; 
+		virtual ~BoxCropEffect(){}; 
 
 		//!Enable the clipping plane. Values *must* be set before calling
 		void enable(unsigned int pass) const;
diff -r 6b379ae667ab src/glPane.cpp
--- src/glPane.cpp	Sun Dec 18 21:00:25 2011 +0000
+++ src/glPane.cpp	Sun Dec 18 21:00:47 2011 +0000
@@ -517,7 +517,6 @@
 	{
 		if(currentScene.haveTempCam())
 		{
-			wxPoint draggingCurrent = event.GetPosition();
 			currentScene.commitTempCam();
 			dragging=false;
 		}
diff -r 6b379ae667ab src/mathglPane.cpp
--- src/mathglPane.cpp	Sun Dec 18 21:00:25 2011 +0000
+++ src/mathglPane.cpp	Sun Dec 18 21:00:47 2011 +0000
@@ -807,7 +807,6 @@
 {
 	if(mouseDragMode == MOUSE_MODE_DRAG_PAN)
 	{
-		wxPoint draggingEnd = event.GetPosition();
 		mouseDragMode=MOUSE_MODE_ENUM_END;
 		//Repaint
 		Refresh();
diff -r 6b379ae667ab src/plot.h
--- src/plot.h	Sun Dec 18 21:00:25 2011 +0000
+++ src/plot.h	Sun Dec 18 21:00:47 2011 +0000
@@ -122,6 +122,8 @@
 class PlotBase
 {
 	public:
+		PlotBase(){};
+		virtual ~PlotBase(){};
 		//The type of plot (ie what class is it?)	
 		unsigned int plotType;
 		
diff -r 6b379ae667ab src/xmlHelper.h
--- src/xmlHelper.h	Sun Dec 18 21:00:25 2011 +0000
+++ src/xmlHelper.h	Sun Dec 18 21:00:47 2011 +0000
@@ -27,6 +27,7 @@
 #include <string>
 using std::string;
 
+#include "basics.h"
 
 //These functions return nonzero on failure,
 //zero on success