Merged with previous release on github

cvjena · Jan 8, 2014 · b333426 · b333426
2 parents 06114f6 + 0f14f1f
commit b333426
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -258,7 +258,8 @@ moc_%.cpp:%.h
 $(BUILDDIR)%.a:
 	@$(MKOUTPUTDIR)
 	$(VERBOSE)echo "+++ linking library $@"
-	$(VERBOSE2)$(AR) cr $@ $(filter %.o,$^)
+	$(VERBOSE2)test -n "$(filter %.o,$^)" && $(AR) -crs $@ $(filter %.o,$^); echo;
+	$(VERBOSE2)test -f "$@" || (touch emptysource.cpp; gcc -c emptysource.cpp; $(AR) -crs $@ emptysource.o; rm emptysource.*); echo
 	@touch $@
 	@$(call MKOUTPUTDIR2,$(LIBSYMLINKDIR))
 	$(VERBOSE2)cd $(LIBSYMLINKDIR);$(SYMLINK) ../$(@:$(BUILDDIR)%=%) $(@F)

diff --git a/core/basics/numerictools.cpp b/core/basics/numerictools.cpp
@@ -13,6 +13,8 @@
 #include <core/basics/Exception.h>
 #include <core/basics/Streamable.h>
 
+typedef unsigned int uint;
+
 namespace NICE {
 
 // check if endptr is empty string (except for whitespaces)

diff --git a/core/basics/numerictools.h b/core/basics/numerictools.h
@@ -7,7 +7,7 @@
  */
 
 #include <cmath>
-// #include <math.h>
+#include <math.h>
 #include <stdlib.h>
 #include <limits>
 #include <string>
@@ -204,7 +204,7 @@ inline double cubeRoot(const double& t) {
  */
 inline bool isNaN(double x) {
 #if (__GNUC__ > 3)
-  return isnan(x);
+  return std::isnan(x);
 #else
   return x != x;
 #endif
@@ -215,7 +215,7 @@ inline bool isNaN(double x) {
  */
 inline bool isNaN(float x) {
 #if (__GNUC__ > 3)
-  return isnan(x);
+  return std::isnan(x);
 #else
   return x != x;
 #endif

diff --git a/core/basics/tools.cpp b/core/basics/tools.cpp
@@ -5,6 +5,8 @@
  */
 #include <core/basics/tools.h>
 
+typedef unsigned int uint;
+
 namespace NICE {
 
 void writeLatexTabular(std::ostream& out,

diff --git a/core/optimization/libdepend.inc b/core/optimization/libdepend.inc
@@ -1,3 +1,3 @@
- $(call PKG_DEPEND_EXT,LINAL)
- $(call PKG_DEPEND_INT,core/vector)
- $(call PKG_DEPEND_INT,core/basics)
+$(call PKG_DEPEND_EXT,LINAL)
+$(call PKG_DEPEND_INT,core/vector)
+$(call PKG_DEPEND_INT,core/basics)