You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2009/09/14 08:12:23 UTC
svn commit: r814486 - in /tuscany/cpp/sca/samples/store: cart.hpp
catalog.hpp currency-composite.hpp currency.hpp item.hpp
store-composite.hpp store-solution.hpp store-test.cpp store-ui.hpp
Author: jsdelfino
Date: Mon Sep 14 06:12:22 2009
New Revision: 814486
URL: http://svn.apache.org/viewvc?rev=814486&view=rev
Log:
Fixed sample namespaces, changed from tuscany to store. Also adjusted ifndef statements in includes to match namespace + include name.
Modified:
tuscany/cpp/sca/samples/store/cart.hpp
tuscany/cpp/sca/samples/store/catalog.hpp
tuscany/cpp/sca/samples/store/currency-composite.hpp
tuscany/cpp/sca/samples/store/currency.hpp
tuscany/cpp/sca/samples/store/item.hpp
tuscany/cpp/sca/samples/store/store-composite.hpp
tuscany/cpp/sca/samples/store/store-solution.hpp
tuscany/cpp/sca/samples/store/store-test.cpp
tuscany/cpp/sca/samples/store/store-ui.hpp
Modified: tuscany/cpp/sca/samples/store/cart.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/cart.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/cart.hpp (original)
+++ tuscany/cpp/sca/samples/store/cart.hpp Mon Sep 14 06:12:22 2009
@@ -19,8 +19,8 @@
/* $Rev$ $Date$ */
-#ifndef SCA_CART_HPP_
-#define SCA_CART_HPP_
+#ifndef store_cart_hpp
+#define store_cart_hpp
#include <string.h>
#include "tuscany/function.hpp"
@@ -29,7 +29,9 @@
#include "item.hpp"
#include "catalog.hpp"
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
const double accum(const double total, const Item& item) {
@@ -72,4 +74,4 @@
};
}
-#endif /* SCA_CART_HPP_ */
+#endif /* store_cart_hpp */
Modified: tuscany/cpp/sca/samples/store/catalog.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/catalog.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/catalog.hpp (original)
+++ tuscany/cpp/sca/samples/store/catalog.hpp Mon Sep 14 06:12:22 2009
@@ -19,15 +19,17 @@
/* $Rev$ $Date$ */
-#ifndef SCA_CATALOG_HPP_
-#define SCA_CATALOG_HPP_
+#ifndef store_catalog_hpp
+#define store_catalog_hpp
#include <string.h>
#include "tuscany/list.hpp"
#include "currency.hpp"
#include "item.hpp"
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
class Catalog {
@@ -62,4 +64,4 @@
};
}
-#endif /* SCA_CATALOG_HPP_ */
+#endif /* store_catalog_hpp */
Modified: tuscany/cpp/sca/samples/store/currency-composite.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/currency-composite.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/currency-composite.hpp (original)
+++ tuscany/cpp/sca/samples/store/currency-composite.hpp Mon Sep 14 06:12:22 2009
@@ -19,14 +19,16 @@
/* $Rev$ $Date$ */
-#ifndef SCA_CURRENCYCOMPOSITE_HPP_
-#define SCA_CURRENCYCOMPOSITE_HPP_
+#ifndef store_currencycomposite_hpp
+#define store_currencycomposite_hpp
#include <string.h>
#include <math.h>
#include "currency.hpp"
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
class Currency : public CurrencyConverter {
@@ -49,4 +51,4 @@
};
}
-#endif /* SCA_CURRENCYCOMPOSITE_HPP_ */
+#endif /* store_currencycomposite_hpp */
Modified: tuscany/cpp/sca/samples/store/currency.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/currency.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/currency.hpp (original)
+++ tuscany/cpp/sca/samples/store/currency.hpp Mon Sep 14 06:12:22 2009
@@ -19,15 +19,16 @@
/* $Rev$ $Date$ */
-#ifndef SCA_CURRENCY_HPP_
-#define SCA_CURRENCY_HPP_
+#ifndef store_currency_hpp
+#define store_currency_hpp
#include <string.h>
#include <math.h>
using std::string;
+using namespace tuscany;
-namespace tuscany
+namespace store
{
class CurrencyConverter {
@@ -59,4 +60,4 @@
};
}
-#endif /* SCA_CURRENCY_HPP_ */
+#endif /* store_currency_hpp */
Modified: tuscany/cpp/sca/samples/store/item.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/item.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/item.hpp (original)
+++ tuscany/cpp/sca/samples/store/item.hpp Mon Sep 14 06:12:22 2009
@@ -19,12 +19,14 @@
/* $Rev$ $Date$ */
-#ifndef SCA_ITEM_HPP_
-#define SCA_ITEM_HPP_
+#ifndef store_item_hpp
+#define store_item_hpp
#include <string.h>
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
class Item {
@@ -44,4 +46,4 @@
};
}
-#endif /* SCA_ITEM_HPP_ */
+#endif /* store_item_hpp */
Modified: tuscany/cpp/sca/samples/store/store-composite.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/store-composite.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/store-composite.hpp (original)
+++ tuscany/cpp/sca/samples/store/store-composite.hpp Mon Sep 14 06:12:22 2009
@@ -19,8 +19,8 @@
/* $Rev$ $Date$ */
-#ifndef SCA_STORECOMPOSITE_HPP_
-#define SCA_STORECOMPOSITE_HPP_
+#ifndef store_storecomposite_hpp
+#define store_storecomposite_hpp
#include <string.h>
#include "tuscany/list.hpp"
@@ -31,7 +31,9 @@
#include "cart.hpp"
#include "store-ui.hpp"
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
class Store : public StoreUI {
@@ -66,4 +68,4 @@
};
}
-#endif /* SCA_STORECOMPOSITE_HPP_ */
+#endif /* store_storecomposite_hpp */
Modified: tuscany/cpp/sca/samples/store/store-solution.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/store-solution.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/store-solution.hpp (original)
+++ tuscany/cpp/sca/samples/store/store-solution.hpp Mon Sep 14 06:12:22 2009
@@ -19,15 +19,17 @@
/* $Rev$ $Date$ */
-#ifndef SCA_STORESOLUTION_HPP_
-#define SCA_STORESOLUTION_HPP_
+#ifndef store_storesolution_hpp
+#define store_storesolution_hpp
#include <string.h>
#include "tuscany/list.hpp"
#include "store-composite.hpp"
#include "currency-composite.hpp"
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
class StoreSolution : public Store {
@@ -60,4 +62,4 @@
};
}
-#endif /* SCA_STORESOLUTION_HPP_ */
+#endif /* store_storesolution_hpp */
Modified: tuscany/cpp/sca/samples/store/store-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/store-test.cpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/store-test.cpp (original)
+++ tuscany/cpp/sca/samples/store/store-test.cpp Mon Sep 14 06:12:22 2009
@@ -31,7 +31,9 @@
using std::cout;
using std::endl;
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
bool testComponentAssembly() {
@@ -47,7 +49,7 @@
}
int main() {
- using namespace tuscany;
+ using namespace store;
cout << "Testing..." << endl;
Modified: tuscany/cpp/sca/samples/store/store-ui.hpp
URL: http://svn.apache.org/viewvc/tuscany/cpp/sca/samples/store/store-ui.hpp?rev=814486&r1=814485&r2=814486&view=diff
==============================================================================
--- tuscany/cpp/sca/samples/store/store-ui.hpp (original)
+++ tuscany/cpp/sca/samples/store/store-ui.hpp Mon Sep 14 06:12:22 2009
@@ -19,8 +19,8 @@
/* $Rev$ $Date$ */
-#ifndef SCA_STOREUI_HPP_
-#define SCA_STOREUI_HPP_
+#ifndef store_storeui_hpp
+#define store_storeui_hpp
#include <string.h>
#include "tuscany/list.hpp"
@@ -29,7 +29,9 @@
#include "catalog.hpp"
#include "cart.hpp"
-namespace tuscany
+using namespace tuscany;
+
+namespace store
{
class StoreUI {
@@ -70,4 +72,4 @@
};
}
-#endif /* SCA_STOREUI_HPP_ */
+#endif /* store_storeui_hpp */