Merge pull request #22 from awslabs/FB-LibCppFix

JonathanHenson · web-flow · commit ff6e37328136 · 2016-08-02T08:19:41.000-07:00
Fb lib cpp fix
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceOperationsSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceOperationsSource.vm
@@ -46,12 +46,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, &${className}::${operation.name}, this, request);
+  return std::async(std::launch::async, [this, request](){ return this->${operation.name}(request); } );
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);
+  m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper( request, handler, context ); } );
 }
 
 void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
@@ -90,12 +90,12 @@ ${operation.name}Outcome ${className}::${operation.name}() const
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable() const
 {
-  return std::async(std::launch::async, &${className}::${operation.name}, this);
+  return std::async(std::launch::async, [this](){ return this->${operation.name}(); } );
 }
 
 void ${className}::${operation.name}Async(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, handler, context);
+  m_executor->Submit( [this, handler, context](){ this->${operation.name}AsyncHelper( handler, context ); } );
 }
 
 void ${className}::${operation.name}AsyncHelper(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/machinelearning/MachineLearningServiceClientSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/machinelearning/MachineLearningServiceClientSource.vm
@@ -67,12 +67,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, &${className}::${operation.name}, this, request);
+  return std::async(std::launch::async, [this, request](){ return this->${operation.name}( request ); } );
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);
+  m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper(request, handler, context); } );
 }
 
 void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/sqs/SQSServiceClientSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/sqs/SQSServiceClientSource.vm
@@ -68,12 +68,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, &${className}::${operation.name}, this, request);
+  return std::async(std::launch::async, [this, request](){ return this->${operation.name}(request); });
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);
+  m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper(request, handler, context); } );
 }
 
 void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlServiceClientOperations.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlServiceClientOperations.vm
@@ -45,12 +45,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, &${className}::${operation.name}, this, request);
+  return std::async(std::launch::async, [this, request](){ return this->${operation.name}( request ); } );
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);
+  m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper( request, handler, context ); } );
 }
 
 void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
@@ -88,12 +88,12 @@ ${operation.name}Outcome ${className}::${operation.name}() const
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable() const
 {
-  return std::async(std::launch::async, &${className}::${operation.name}, this);
+  return std::async(std::launch::async, [this](){ return this->${operation.name}(); } );
 }
 
 void ${className}::${operation.name}Async(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, handler, context);
+  m_executor->Submit( [this, handler, context](){ this->${operation.name}AsyncHelper( handler, context ); } );
 }
 
 void ${className}::${operation.name}AsyncHelper(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
diff --git a/scripts/build_3rdparty.py b/scripts/build_3rdparty.py
@@ -271,6 +271,9 @@ def Main():
         print( "No definition for target architecture " + architecture )
         return 1
 
+    if architecture == "Linux":
+        os.environ["CXX"] = "clang++ -stdlib=libc++"
+
     targetPlatformDef = platformBuildTargets[ architecture ]
     if not sourcePlatform in targetPlatformDef[ 'buildPlatforms' ]:
         print( "Platform " + sourcePlatform + " does not support building for architecture " + architecture )

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque`
`46`	`46`
`47`	`47`	`${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const`
`48`	`48`	`{`
`49`		`- return std::async(std::launch::async, &${className}::${operation.name}, this, request);`
	`49`	`+ return std::async(std::launch::async, [this, request](){ return this->${operation.name}(request); } );`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`53`	`53`	`{`
`54`		`- m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);`
	`54`	`+ m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper( request, handler, context ); } );`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`@@ -90,12 +90,12 @@ ${operation.name}Outcome ${className}::${operation.name}() const`
`90`	`90`
`91`	`91`	`${operation.name}OutcomeCallable ${className}::${operation.name}Callable() const`
`92`	`92`	`{`
`93`		`- return std::async(std::launch::async, &${className}::${operation.name}, this);`
	`93`	`+ return std::async(std::launch::async, [this](){ return this->${operation.name}(); } );`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`void ${className}::${operation.name}Async(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`97`	`97`	`{`
`98`		`- m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, handler, context);`
	`98`	`+ m_executor->Submit( [this, handler, context](){ this->${operation.name}AsyncHelper( handler, context ); } );`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`void ${className}::${operation.name}AsyncHelper(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque`
`67`	`67`
`68`	`68`	`${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const`
`69`	`69`	`{`
`70`		`- return std::async(std::launch::async, &${className}::${operation.name}, this, request);`
	`70`	`+ return std::async(std::launch::async, [this, request](){ return this->${operation.name}( request ); } );`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`74`	`74`	`{`
`75`		`- m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);`
	`75`	`+ m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper(request, handler, context); } );`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque`
`68`	`68`
`69`	`69`	`${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const`
`70`	`70`	`{`
`71`		`- return std::async(std::launch::async, &${className}::${operation.name}, this, request);`
	`71`	`+ return std::async(std::launch::async, [this, request](){ return this->${operation.name}(request); });`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`75`	`75`	`{`
`76`		`- m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);`
	`76`	`+ m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper(request, handler, context); } );`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque`
`45`	`45`
`46`	`46`	`${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const`
`47`	`47`	`{`
`48`		`- return std::async(std::launch::async, &${className}::${operation.name}, this, request);`
	`48`	`+ return std::async(std::launch::async, [this, request](){ return this->${operation.name}( request ); } );`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`52`	`52`	`{`
`53`		`- m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, request, handler, context);`
	`53`	`+ m_executor->Submit( [this, request, handler, context](){ this->${operation.name}AsyncHelper( request, handler, context ); } );`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`void ${className}::${operation.name}AsyncHelper(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`@@ -88,12 +88,12 @@ ${operation.name}Outcome ${className}::${operation.name}() const`
`88`	`88`
`89`	`89`	`${operation.name}OutcomeCallable ${className}::${operation.name}Callable() const`
`90`	`90`	`{`
`91`		`- return std::async(std::launch::async, &${className}::${operation.name}, this);`
	`91`	`+ return std::async(std::launch::async, [this](){ return this->${operation.name}(); } );`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`void ${className}::${operation.name}Async(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`
`95`	`95`	`{`
`96`		`- m_executor->Submit(&${className}::${operation.name}AsyncHelper, this, handler, context);`
	`96`	`+ m_executor->Submit( [this, handler, context](){ this->${operation.name}AsyncHelper( handler, context ); } );`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`void ${className}::${operation.name}AsyncHelper(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const`