Make the compile work on a Mac

Makefile

@@ -34,6 +34,9 @@ VERSION = 0.6.1
 NAME = fnss
 ARCHIVE_NAME  = fnss-cpp-api-$(VERSION)
 
+# BUILD TARGET
+BUILDTARGET = $(shell uname)
+
 # Compiler options
 LDFLAGS  =
 LDLIBS   =
@@ -132,8 +135,13 @@ remove_root = $(shell echo $1 | sed s/\[.]\*\[/]\*\[^/]\*\\\///)
 get_src     =  $2/$(call remove_root, $(basename $1)$(SRC_EXT))
 get_bin     = $(filter %$(notdir $1), $(BIN))
 get_bin_dep = $(filter $(subst $(HDR_EXT),$(SRC_EXT), $(filter $(patsubst ./%,%,$(HDR)), $1)), $(patsubst ./%,%,$(SRC)))
+ifeq ($(BUILDTARGET),Darwin)
+make_dep    = @$(CXX) -MM $(CXXFLAGS) $1 > $2.d; \
+              sed -i '' 's/.*:/$(subst /,\/,$@):/' [email protected]
+else
 make_dep    = @$(CXX) -MM $(CXXFLAGS) $1 > $2.d; \
               sed -i 's/.*:/$(subst /,\/,$@):/' [email protected]
+endif
 
 # Compile a file and print message. Args: <src_file> <dest_file> <cxx_options>
 compile     = @echo "Compiling:   $(strip $1) -> $(strip $2): " $(shell $(call compile_cmd, $1, $2, $3))

src/edge.h

@@ -26,7 +26,7 @@ namespace fnss {
 /**
  * Default buffer size, set if no buffer size is specified in the constructor
  */
-#define DEFAULT_BUFFER_SIZE "100packets"
+#define DEFAULT_BUFFER_SIZE "1kB"
 
 /**
  * Represent an edge of a topology

src/quantity.cpp

@@ -1,6 +1,7 @@
 #include "quantity.h"
 
 #include <sstream>
+#include <regex>
 
 namespace fnss {
 
@@ -20,8 +21,19 @@ Quantity::Quantity(const MeasurementUnit &converter_) :
 	value(0), unit(converter_.getBaseUnit()), converter(converter_) {}
 
 void Quantity::fromString(const std::string &str) {
-	std::istringstream ss(str);
-	ss>>this->value>>this->unit;
+
+	std::string regexpstr = "([0-9]+)(\\.[0-9]*)? *([^ \t]*)";
+	std::regex reg(regexpstr);
+	std::smatch match;
+	std::regex_search(str, match, reg);
+
+	if (!match.empty()) {
+		this->value = std::stod(match[1].str() + match[2].str());
+		this->unit = match[3];
+	} else {
+		this->value = 0.0;
+		this->unit = "";
+	}
 
 	if(this->unit == "")
 		this->unit = this->converter.getBaseUnit();

test/test.cpp

@@ -302,6 +302,8 @@ void testEdge() {
 	cout<<"Edge test: ";
 
 	Edge e;
+
+	e.setBufferSize(Quantity("1kB", Units::Data));
 	// test default values
 	assert(e.getCapacity().toString() == DEFAULT_CAPACITY);
 	assert(e.getDelay().toString() == DEFAULT_DELAY);
@@ -520,7 +522,7 @@ void testEvent() {
 
 void testQuantity() {
 	cout<<"Quantity test: ";
-	Quantity t1(Units::Time);
+	Quantity t1("2days",Units::Time);
 	Quantity t2(1, "h", Units::Time);
 	Quantity t3("60min", Units::Time);
 	Quantity t4("3601 sec", Units::Time);